changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	_config.yml
	_includes/about.html
	_includes/header.html
	mail/contact_me.php