Creating template
Merged Openshift ssh://rails-coderit.rhcloud.com/~/git/rails

Conflicts:
	README.md
	config.ru