Creating template
Merge branch 'master' of github.com:oomlaut/bullet-journal

Conflicts:
	README.md