Delete all content in www.txt
Merge branch 'master' of https://github.com/steven090795/test1

Conflicts:
	www.txt
Merge branch 'master' of https://github.com/steven090795/test1

Conflicts:
	www.txt