Fixed Splash Screen
Merge branch 'master' of
https://github.com/DrWhatsisname/CS2110-Ghost-Hunter-Group-17.git

Conflicts:
	GhostHunter17/bin/GhostHunter17.apk
	GhostHunter17/bin/classes.dex
	GhostHunter17/bin/classes/edu/virginia/cs2110/ghosthunter17/MainActivity.class
	GhostHunter17/bin/classes/edu/virginia/cs2110/ghosthunter17/R$id.class
	GhostHunter17/bin/classes/edu/virginia/cs2110/ghosthunter17/R$layout.class
	GhostHunter17/bin/classes/edu/virginia/cs2110/ghosthunter17/R$menu.class
	GhostHunter17/bin/classes/edu/virginia/cs2110/ghosthunter17/R$string.class
	GhostHunter17/bin/classes/edu/virginia/cs2110/ghosthunter17/R$style.class
	GhostHunter17/bin/resources.ap_
	GhostHunter17/gen/edu/virginia/cs2110/ghosthunter17/R.java
	
(Hopefully I didn't break it)