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

Conflicts:
	config.ru
configdatabase for openshift