Ying - local change
Merge branch 'master' of https://github.com/hanwpi/SoftwareAuthenticatorTest

Conflicts:
	README.md