Rebuilding site using latest version of Jekyll
Rebuilding site using latest version of Jekyll
Merge branch 'master' of github.com:mseymour/mseymour.github.io

Conflicts:
	_config.yml
fix config