fix it maybe
Merge branch 'master' of https://github.com/joeygallegos/ThePurge

Conflicts:
	src/me/joeygallegos/purge/GameManager.java