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

Conflicts:
	README.md