fixed bug in user pages and changed css
removed comments
Merge branch 'development'

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