Add collisions between people and projectiles
Merge branch 'master' of github.com:Yeggebomb/yeggebomb

Conflicts:
	src/frontend/javascript/game.js