Generalizing controller code
Merge branch 'master' of https://github.com/ssterman/cs376