Do you even push bro
Merge branch 'master' of https://github.com/Epiphane/AnythingElse

Conflicts:
	TheGame/src/com/gilded/thegame/Entity.java