Updated controller and view
Merge branch 'master' into controller
Merge pull request #2 from JustSilverman/controller

updated view and controller