something
Merge branch 'master' of https://github.com/AnhOnymous/GhostHunterGame.git
dirty work tree
Merge branch 'master' of
https://github.com/AnhOnymous/GhostHunterGame.git

Conflicts:
	src/edu/virginia/cs2110/ghosthuntergame/Bones.java
ugh