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

Conflicts:
	README.md