add Gemfile.lock for Heroku deployment
Merge branch 'master' of https://github.com/nastysloper/dbc_stack_overflow_clone
Merge branch 'master' of https://github.com/nastysloper/dbc_stack_overflow_clone
Merge branch 'master' of https://github.com/nastysloper/dbc_stack_overflow_clone
remove username from database.yml file for Heroku
Merge pull request #32 from nastysloper/deploy

Deploy
Merge pull request #33 from nastysloper/tests

fix voter controller tests for new uniqueness requirement
Merge branch 'master' into views
indent when nested