upload
first upload
Merge branch 'master' of github.com:YuqingXia/MediaSystem

Conflicts:
	README.md
Merge README.md