Gravatar image shown on user profile page
remove unused generated files
Change config/routes to use resources user
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
Allow any user to see anyone elses profile page
Merge branch 'master' of github.com:mknicos/squmblr into mknicos-master

* 'master' of github.com:mknicos/squmblr:
  Allow any user to see anyone elses profile page
  Fix Gemfile Duplicates
  user show feature testing using fabricate
  Change config/routes to use resources user
  remove unused generated files
  Gravatar image shown on user profile page
Merge branch 'mknicos-master'

* mknicos-master:
  Allow any user to see anyone elses profile page
  Fix Gemfile Duplicates
  user show feature testing using fabricate
  Change config/routes to use resources user
  remove unused generated files
  Gravatar image shown on user profile page