# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/build.gradle
#	app/src/main/java/me/szaki/xkcd/xkcdbrowser/XKCDBrowserApplicationComponent.java
#	app/src/main/java/me/szaki/xkcd/xkcdbrowser/ui/favorites/FavoritesPresenter.java
#	app/src/main/java/me/szaki/xkcd/xkcdbrowser/ui/main/MainPresenter.java

implement retrofit

merge of labor4

update android version

add master to development

fix android name in manifest

implement skeleton mvp

# Conflicts:
#	.travis.yml