committing so i can check out master
Merge branch 'master' into testing
user specs
Merge branch 'master' into testing
solved merge conflict in gemfile.lock
solved merge conflict
Merge branch 'master' into testing
Merge pull request #13 from nealcpeters/testing

Testing