commited change that has conflict
Merge branch 'master' of https://github.com/bingtimren/EnglishDigitListeningTrainer

Conflicts:
	README.md