Collision Detection!
Merge branch 'collisionDetection'

Conflicts:
	lib/entity.js
Merge branch 'master' of https://github.com/michaelpetrov/paper-unicorn-attack
Merge branch 'master' of https://github.com/michaelpetrov/paper-unicorn-attack