splashscreen
Merge branch 'master' of https://github.com/rmccampbell/GhostHunter

Conflicts:

GhostHunter/bin/classes/edu/virginia/cs2110/rnm6u/ghosthunter/R$attr.cla
ss

GhostHunter/bin/classes/edu/virginia/cs2110/rnm6u/ghosthunter/R$dimen.cl
ass

GhostHunter/bin/classes/edu/virginia/cs2110/rnm6u/ghosthunter/R$drawable
.class

GhostHunter/bin/classes/edu/virginia/cs2110/rnm6u/ghosthunter/R$string.c
lass
	GhostHunter/gen/edu/virginia/cs2110/rnm6u/ghosthunter/R.java