wrote a few tests (wip)
add spec/user_spec.rb
fix merge conflicts
Merge pull request #7 from gopher-snakes-2013/fix_merge_conflicts_rspec

Fix merge conflicts rspec