Updated the about page
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/css/template.css