about page redesign
Merge branch 'ahoefinger/topic/about_page_redesign'

Conflicts:
	templates/vegancity/about.html