Merge branch 'master' of github.com:scelfo/tonyscelfo.com

Conflicts:
	_build.sh
Merge branch 'master' of github.com:scelfo/tonyscelfo.com