Fixed Spike hitboxes

Also changed hit detection to briefly show collision frame when you hit
a spike (so you know for sure you hit it)
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/player.js
Merge branch 'master' of https://github.com/esjay/just-deserts