put the compiled site in the proper branch
Merge branch 'master' of github.com:douglasgoodwin/douglasgoodwin.github.com

Conflicts:
	.gitignore
	.gitmodules