user show page
Merge branch 'master' of https://github.com/tastycode/explore into sierrabrown/feature

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/user.rb
	db/schema.rb