Resolve #8

Conflicts:
	app/views/home/_about.html.erb