Creating template
Merge branch 'master' of ssh://nodejs-coldencullen.rhcloud.com/~/git/nodejs into openshiftmerge

Conflicts:
	README.md
	package.json
	server.js
Using correct server.js
Merge branch 'openshiftmerge'