Worked on more stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/holyshatots/readnslash/model/Book.class
	bin/classes/com/holyshatots/readnslash/model/BookDatabase.class
	bin/classes/com/holyshatots/readnslash/model/BookDatabaseHelper.class
	bin/classes/com/holyshatots/readnslash/view/MainActivity.class
	bin/classes/com/holyshatots/readnslash/view/SignupActivity.class