Merge branch 'master' of https://github.com/DenisCarriere/addxy

Conflicts:
	README.md