edited users table
Merge branch 'master' of https://github.com/opleban/Snack_Overflow into melissa
added questions view
merged from master
Added modifications to homepage top questions view
Merge pull request #9 from opleban/plauer_implement_login

Plauer implement login
adding questions changes
Merge branch 'master' of https://github.com/opleban/Snack_Overflow into melissa
Adds styling to welcome page
Merge pull request #10 from opleban/Ori

Adds styling to welcome page
changed links on index homepage
resolved merge conflict with frontpage
Merge pull request #11 from opleban/melissa

adding changes to frontpage link logic and questions views
Adds rails_12factor to gemfile per Heroku instructions in preparation for deployment
sets ruby version 2.0.0 in gemfile
updated gemfile.lock file
comments out username and password per heroku instructions
removes shallow nesting from routes
fixes bug in routes
fixes routes, adds missing space before do, adds require statement for css