message
Merge branch 'master' of https://github.com/dgcoffman/dgcoffman.github.io

Conflicts:
	index.html
	styles/158ef373.main.css
	styles/a89791d6.main.css
	styles/f75f68e2.main.css
fuck