social links added to config.yml
Merge branch 'master' of https://github.com/travisdailey/avansfarm

Conflicts:
	_config.yml
	_source/_includes/footer.html
	_source/about/index.html
	public/404.html
	public/family/index.html
	public/index.html