test index.js commit.
Merge branch 'master' into test_index.js

* master:
  Added Player type to Body class, which stores health and score
  Revert "Added Player type to body which stores health and score."
  Added Player type to body which stores health and score.
  Refactoring body class, removed deadly shapes

Conflicts:
	game/js/game.js
Game abstraction WIP.