Creating template
merge
Merge branch 'master' of ssh://nodejs-reussir.rhcloud.com/~/git/nodejs

Conflicts:
	.openshift/cron/weekly/chronograph
	README.md
	package.json