Made two controllers
Merge branch 'master' of https://github.com/soapy1/UW-Plan