routes, controller work
Merge branch 'master' of github.com:ashleygwilliams/trebek