guard and spork
Merge branch 'master' into implement_questions
merged the user model/migration
Merge branch 'master' into implement_questions
Added user model association, integration tests pass
Fixed merge conflict in Gemfile