Merge branch 'master' of https://github.com/the-duck/launcher

Conflicts:
	README.md
readme

readme