trying to fix broken thing
Merge branch 'master' of https://github.com/erinspace/erinspace.github.io

Conflicts:
	index.html
	rss/index.rss