Setting up lanyon
Merge branch 'master' of https://github.com/aep000/aep000.github.io

Conflicts:
	_config.yml
	_layouts/default.html