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

Conflicts:
	README.md