rails g devise:views
Gravatar image shown on user profile page
Cloned squmblr, edit email and password works
Tests for blank email, wrong pw confirmation
converted registrations edit.html to haml
Merge branch 'master' of https://github.com/elizabrock/squmblr
merging eliza's master with local
remove unused generated files
Change config/routes to use resources user
User can recover password with email or username
fixed some whitespace
test refactored
including schema changes
Merge branch 'master' of https://github.com/JamesNix/squmblr
merging with Giovanni's refactored tests
Install vcr.
Fixed comments and undid login via username
Deleted unrelated files and converted erb to haml
Face palm with indentation
user show feature testing using fabricate
Merge branch 'master' of https://github.com/elizabrock/squmblr

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/user.rb
	config/routes.rb
Fix Gemfile Duplicates