fixed untracked files
Hopefully resolved conflicts.

Conflicts:
	GhostHunter/bin/GhostHunter.apk
	GhostHunter/bin/classes.dex
	GhostHunter/src/erm5dc/ghosthunter/game/GameScreen.java
	GhostHunter/src/erm5dc/ghosthunter/game/Mario.java