added buttons to the controls, hooking them up next
Merge branch 'master' of https://github.com/Charlie-Y/CS147-project