Balzac
Merge branch 'master' of https://github.com/joshua-bailey/joshua-bailey.github.io

Conflicts:
	_config.yml