User profile changes
Merge branch 'master' of github.com:johnathon101/project-workhang

Conflicts:
	app/views/users/show.html.erb
	db/seeds.rb