combined controllers
Merge branch 'master' of https://github.com/NoahSommerfeld/cs304.git