update seed file, and tweaked user associations so the seed would work
Merge branch 'master' into seed-file
creates user controller test
Merge branch 'master' into users-controller-testing
Merge branch 'master' of https://github.com/purple-martins-2013/snack-overflow
Merge branch 'master' into feature_question_spec
Display Question and Answer on show page