updated controller and view
added stuff
Merge pull request #25 from willtsay/e7chun

E7chun