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

* 'master' of github.com:georgelaughalot/TheGame:
  button location
added the callback timer