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
correctly handles re-login
updated events index with formatting and Rails notation
Merge pull request #31 from nastysloper/seed_data

seed data working
Merge pull request #30 from nastysloper/controllers

correctly handles re-login
Merge pull request #29 from nastysloper/event_views

updated events index with formatting and Rails notation
remove username from database.yml file for Heroku
votes controller tests correctly handle uniqueness validation
refactor for fewer db calls
appropriate redirects
Merge pull request #32 from nastysloper/deploy

Deploy
Merge pull request #33 from nastysloper/tests

fix voter controller tests for new uniqueness requirement
nested comments visible only
Merge branch 'master' into views
indent when nested
create further nested comments