git is making me commit
Merge branch 'master' of github.com:jlcasto/alisonHarper

Conflicts:
	sitemap.xml
	sitemap.xml.gz
Revert "Merge branch 'master' of github.com:jlcasto/alisonHarper"

This reverts commit f0a2f436f8a76bbe1fe9d5942f9df1dd26107477, reversing
changes made to 0a6f584e50be2aa2a8cdde7b7f81be3653851ea0.
Revert "Merge branch 'master' of github.com:jlcasto/alisonHarper"

Conflicts:
	sitemap.xml
	sitemap.xml.gz