Added tests for the User model
Merge branch 'master' into testing_stuff
Merge pull request #2 from nealcpeters/testing_stuff

Testing stuff