modified static home page by deleting link to rails tutorial
added gem 'factory_girl_rails', '4.2.1'
initial add of factories_spec.rb
added spec/factories_spec.rb and app/views/users/show.html.erb
added 'bcrypt-ruby', '3.1.2' ot Gemfile and changed Mentor Match to Mentor Link in static_pages_spec.rb
added tests and fixed events
Merge pull request #2 from Jessica-L/noahs-branch

added tests and fixed events
added a basic profile page
Merge pull request #3 from Jessica-L/jess-changes

Jess changes
Merge pull request #4 from Jessica-L/abgordon

added a basic profile page
working rspec for master
db migrate after most recent pull from origin
merge of master into user-microposts and also resolved merge conflict in factories_spec.rb
adding a column datetime to micropost db