Updated controllers
Merge branch 'master' of github.com:phishycake/ChairGame