added questions#show route
removed rubocop numericliterals cop
removed Question.random_question method and corresponding routes, actions and tests
re-added show action to questions controller
updated questions_controller_test to match re-added show action
Merge branch 'master' of github.com:secretBears/qapi into admin
Merge branch 'master' of github.com:secretBears/qapi
Merge branch 'admin'
added test for static#index page
added controller for static pages
added static#index route, action, view and updated Gemfile to support haml
changed index page view from haml to erb
completed info text about how to use qapi
updated tests for index page
improved static#index template
Merge branch 'admin'
updated README.rdoc
don't know what i did here
added new heroku key
Merge branch 'master' of github.com:secretBears/QAPI

merged alex shit which is not working!!!!!!!!!!!