playing with editor option
Merge branch 'master' of https://github.com/astro-friedel/ADASS
Merge branch 'master' of https://github.com/astro-friedel/ADASS

Conflicts:
	README.md

(i thought i had fixed these - deliberate - conflicts)