modified:   default.html
Merge branch 'master' of https://github.com/joelhumann/joelhumann.github.io

Conflicts:
	_layouts/default.html

	deleted:    CNAME
	modified:   _layouts/default.html
	modified:   css/main.css