Entities.
Merge branch 'master' of github.com:ryanleong/ZombieApocalypse

Conflicts:
	Makefile