cleanup
Merge branch 'master' of github.com:georgelaughalot/TheGame

* 'master' of github.com:georgelaughalot/TheGame:
  base button
fix player game
Merge branch 'master' of github.com:georgelaughalot/TheGame

* 'master' of github.com:georgelaughalot/TheGame:
  button shake