add controller.rb
Update Controller

-added some methods to our controller class
Merge branch 'master' into controller
Merge pull request #4 from juggler434/controller

Controller