Controller change.
Merge branch 'master' of github.com:kevinpeterson/SEng-5831-Lab2