add css file updated views with css
Merge remote-tracking branch 'origin/jennifer'

Conflicts:
	app/views/users/show.html.erb