Merge pull request #9 from WomenWhoCode/develop

Develop - merge work into master
Merge branch 'develop' into master to prep for push to heroku
update rails for security reasons
Merge remote-tracking branch 'upstream/master' into develop
added gravatar to user profile
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	app/helpers/users_helper.rb
	app/views/users/show.html.erb
Merge pull request #16 from sowjumn/develop

Develop