fix merge conflict
Merge branch 'master' of git@github.com:riotopsys/GitDemo.git

Conflicts:
	licence.md