Styling on user detail view
Merge branch 'master' of github.com:kschmit90/TaskManagerProject

Conflicts:
	app/assets/stylesheets/global.css
	app/views/layouts/application.html.erb