reworking JS code
Merge branch 'master' of github.com:ehermanson/ehermanson.github.io

Conflicts:
	_dev/js/global.js
	_dev/js/site.js
	_site/assets/global.min.js
	assets/global.min.js