Merge branch 'origin/master'

Conflicts:
	atom.xml
	blog/archives/index.html
	index.html
	sitemap.xml
	stylesheets/screen.css
Merging
Removed file due to build error