change
Merge branch 'master' of github.com:Mark-Chang-KKBOX/test

Conflicts:
	README.txt