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

Conflicts:
	README.md
	index.html
	package.json
	server.js