Android Studio
Merge branch 'master' of github.com:MarcBernstein/android-goodreads-api

Conflicts:
	app/app.iml
build