Logo and button update 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/AndroidManifest.xml
	bin/Team9.apk
	bin/classes.dex
	bin/classes/com/hackprinceton/team9/MainActivity.class
	bin/classes/com/hackprinceton/team9/R$drawable.class
	bin/classes/com/hackprinceton/team9/R$id.class
	bin/classes/com/hackprinceton/team9/R$layout.class
	bin/classes/com/hackprinceton/team9/R$menu.class
	bin/classes/com/hackprinceton/team9/R$string.class
	bin/classes/com/hackprinceton/team9/R$style.class
	bin/dexedLibs/android-support-v4-be3fdb4624cb257c222171d8b5950ecb.jar
	bin/res/crunch/drawable-xhdpi/ic_launcher.png
	bin/res/crunch/drawable-xxhdpi/ic_launcher.png
	bin/resources.ap_