removed tab active class
resolved merge conflict
rspec testing for user model part 1
Merge pull request #16 from hgw2101/rspec_testing

Rspec testing