Worked on user show page
Merge branch 'user'

Conflicts:
	public/css/application.css