work on the heart beating
Merge branch 'master' of https://github.com/Bradshaw/octo-hipster

Conflicts:
	src/Robot.js
	src/game.js
	src/server.node.js
fix an error something null trying to be change
Merge branch 'master' of https://github.com/Bradshaw/octo-hipster

Conflicts:
	src/game.js