Stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/ca/informeapps/informeryerson/CampusLife/Bookstore/BookstoreActivity.java
	app/src/main/java/ca/informeapps/informeryerson/MainActivity.java
	app/src/main/res/drawable/ryerson_campus_store.jpg
iOS recruit info (needs more work)