init
Merge branch 'master' of github.com:chunterg/template-lofty

Conflicts:
	README.md