readme
Merge branch 'master' of https://github.com/ArthusLiang/MyVoix

Conflicts:
	README.md