testing
Update README.txt
1
Update README.txt
Merge branch 'trunck' of github.com:yycaa2002/myfirstproject

Conflicts:
	README.txt