created generated rspec and created first unit testing on user model
fixed merged conflicts
fixed other merge conflicts
Merge branch 'master' of https://github.com/feministy/littlebooks into unit_tests
to fix typo in session controller
tests for the user model only
added more tests to the user model
finished user unit tests
resolved merge conflict in user model
Merge pull request #29 from feministy/unit_tests

Unit tests for User model