fix
good
checkout
commit bin
Trying to get xavier's codMerge branch 'xjs' of https://github.com/nrkefauver/CSE5236_Group1 into edo

Conflicts:
	Hinkling/bin/classes.dex
	Hinkling/bin/jarlist.cache
	Hinkling/bin/res/crunch/drawable-hdpi/ic_launcher.png
	Hinkling/bin/res/crunch/drawable-hdpi/ic_next.png
	Hinkling/bin/res/crunch/drawable-mdpi/bgb.png
	Hinkling/bin/res/crunch/drawable-mdpi/bgg.png
	Hinkling/bin/res/crunch/drawable-mdpi/bgr.png
	Hinkling/bin/res/crunch/drawable-xhdpi/ic_launcher.png
	Hinkling/bin/res/crunch/drawable-xhdpi/ic_next.png
	Hinkling/bin/res/crunch/drawable-xxhdpi/ic_launcher.png
	Hinkling/bin/res/crunch/drawable-xxhdpi/ic_next.png
	Hinkling/bin/resources.ap_