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

Conflicts:
	README.md
	package.json
	server.js