a little modification
Merge branch 'source' of https://github.com/shpeacelover/shpeacelover.github.com into source

Conflicts:
	_deploy
	public/atom.xml
	public/sitemap.xml
	public/stylesheets/screen.css