fixed shooting while mouse is stationary
diagnose shooting
Added collisions between entities
Merge branch 'master' into collisions
minor changes
Merge remote-tracking branch 'origin/master' into arrow-keys-shooting

Conflicts:
	entities/Protagonist.js