Tidying up Hello World Project
Merge branch 'master' of github.com:zettajs/zettajs.github.io

Conflicts:
	projects/_posts/2014-10-01-Share-A-Project.md
manual merge