Updated Controller
Merge branch 'master' of https://github.com/danvas/cs304-part3.git
A bunch of stuff.