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

Conflicts:
	.openshift/action_hooks/deploy
	.openshift/action_hooks/pre_build
	.openshift/markers/README
	config.ru
Revert "Adding websockets example."

This reverts commit 34ebc935f0ed5a37d2a0112b866b105b9b3acd2d.

Conflicts:
	Gemfile
	Gemfile.lock