editing in master
Merge branch 'master' of https://github.com/EasonPai/Example into testing

Conflicts:
	README.txt

resolved conflict by merge 2 changes