Added rails_12factor gem for Heroku
Modified database credentials file consistent w/ Heroku instructions
Add database.yml to .gitignore
Specify ruby version (for Heroku)
Add login helper method for capybara tests
Modify LoginHelper to make it work
Add acceptance test for add_activity feature
Add Activity model; passes tests
Add simple_form gem
Add category_id to Activity model
Add Category model; passes tests
Add Category factory
Pushing to github to deal w/ simple_form issue
Add database.example.yml to git
Add database.example.yml file -- wasn't under git control before
Merge branch 'master' into add_activity
Add_activity feature passes happy path test
Refactor happy path test
Add_activity user story complete