Merge pull request #1 from JustSilverman/controller

replaced with correct files
Updated controller and view
Merge branch 'master' into controller