Entity stuff maybe? I don't know
Merge branch 'master' of https://github.com/colinwackl/dangerzone

Conflicts:
	game/main.lua
Updating hump
enemies and bullets