Creating template
Merge remote-tracking branch 'openshift/master'

Conflicts:
	index.html
	package.json
	server.js