#2 update
Merge branch 'master' of https://github.com/chickenrainteam/MyUpload

Conflicts:
	README.md