added several changes
Merge branch 'master' of github.com:loadays/loadays.org

Conflicts:
	archives.html
	categories.html
	feeds/all.atom.xml
	feeds/all.rss.xml
	index.html