add first controller
Merge pull request #1 from tiger-swallowtails-2013/first_controller

add first controller
fix merge conflict in config/routes.rb
solved merge