Spec Helper file updated
spec helper file merge conflicts resolved.
Gemfile and Gemfile.lock updated
Added Pending status to two tests until we start work on the views.
Merge pull request #6 from dbcfoxes2014/user_tests

User tests