let's start fresh. again.
save our local changes
no submodules please
Merge branch 'master' of github.com:douglasgoodwin/douglasgoodwin.github.com

Conflicts:
	_root/index.md
	compiled/index.html
	config.yml
	theme-bootstrap-2
clean