Final touch up
Merge branch 'annam-suggestions'

Conflicts:
	app/views/static_pages/about.html.erb