error???
Merge branch 'master' of https://github.com/AnhOnymous/GhostHunterGame.git
dirty worktree??
Merge branch 'master' of
https://github.com/AnhOnymous/GhostHunterGame.git

Conflicts:
	project.properties