updated controller
Merge branch 'master' of https://github.com/whyu/wdi_project_2