toggle float
fixed merge conflicts
fixed activation/deactivation bug
Merge branch 'troops' of github.com:KopiSusu/Globe into troops

* 'troops' of github.com:KopiSusu/Globe:
  fixed bugs
hooked up buttons to game moves