Objects Now Entities
Merge branch 'master' of github.com:HackSoc/LudumDare28
Bah
Conflicts:
	entity/Tile.lua