Commented out pry
fixed merge conflicts
new routes
Merge pull request #4 from stevenspiel/controller_views

Controller views