Added an inventory system.  We still need items to put in the inventory.
Fixed IsTouching in Entity.
Merge branch 'master' of https://github.com/makerslocal/LudumDare30

Conflicts:
	game.html
	style.css