7 th update
Merge branch 'master' of github.com:ChingChien/Test

Conflicts:
	my.txt