Creating template
Hello World
Merge branch 'master' of ssh://kraken-tentacularapps.rhcloud.com/~/git/kraken

Conflicts:
	README.md