auto-themes
Merge branch 'master' of https://github.com/zot/TestLeisure

Conflicts:
	testFile.lorg