updated controller files
Merge branch 'master' of https://github.com/koreyconway/sysc3010