Add an entity system
Merge remote-tracking branch 'origin/master'

Conflicts:
	Makefile
	game.js
Make source mapping actually work
Merge remote-tracking branch 'origin/master'