trying again
Merge branch 'master' of https://github.com/bechatman/test

Conflicts:
	_config.yml