Okay, let's try this again
Merge branch 'master' of https://github.com/shawnmdickinson/shawnmdickinson.github.io

Conflicts:
	CNAME