updated controller
Merge branch 'front' of https://github.com/hack4reno2013/housemind into front