updated controller
fixed merge conflict.. prob
Merge pull request #20 from willtsay/will

updated controller