new config
Merge branch 'master' of github.com:piscesvivian/piscesvivian.github.com

Conflicts:
	_config.yml