hammer, interaction, items
Merge branch 'master' of https://github.com/nthiebes/GameJam

Conflicts:
	Gruntfile.js
	js/src/core.js