update
Merge branch 'master' of https://github.com/hicksca/hicksca

Conflicts:
	_config.yml