making changes to the schedule fragment, adding new features to the library list
Merge branch 'master' of https://github.com/VinnieTheGinnie/MADFinalsApp

Conflicts:
	bin/Fapp.apk
	bin/classes.dex
	bin/classes/com/mobileappdevelopersclub/fapp/Constants.class
	bin/classes/com/mobileappdevelopersclub/fapp/R$drawable.class
	bin/classes/com/mobileappdevelopersclub/fapp/R$id.class
	bin/classes/com/mobileappdevelopersclub/fapp/R$layout.class
	bin/classes/com/mobileappdevelopersclub/fapp/R$menu.class
	bin/classes/com/mobileappdevelopersclub/fapp/R$string.class
	bin/classes/com/mobileappdevelopersclub/fapp/R$style.class
	bin/classes/com/mobileappdevelopersclub/fapp/adapters/LibraryListItemAdapter$$ViewInjector.class
	bin/classes/com/mobileappdevelopersclub/fapp/ui/LibraryListFragment.class
	bin/resources.ap_
	res/values-sw600dp/dimens.xml
	res/values-sw720dp-land/dimens.xml

temp merge