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

Conflicts:
	README.md
	package.json
	server.js