Creating template
Merge branch 'master' of ssh://hello-mfdc.rhcloud.com/~/git/hello

Conflicts:
	package.json
	server.js
Removed sample README
Removed more OpenShift files
Changed port to 80
Switched back to port 3000 to see if that fixes things
Switched ENV variables to use OPENSHIFT_ prefix
Dropped Heroku stuff
Added README file