trying to get the about page working.
Merge branch 'master'

Conflicts:
	_config.yml