created seed file
created basic user profile, users/:id
resolved merge conflicts between nick's branch and tali's branch spec. Gemfile, questions_controller, and seeds
Merge pull request #7 from elenasharma/Tali

Tali