final commit maybe
Merge branch 'master' of https://github.com/bsanders/softeng
swapped out controller class with new one, will eventually restructure controller