Creating template
Merge ssh://app-gypsyclick.rhcloud.com/~/git/app

Conflicts:
	server.js