Adding rspec and factory gurl
adding stuff
Fixing merge conflicts