from charlesy
Merge branch 'master' of https://github.com/ysc0423/MyRepository into charlesy

Conflicts:
	README.md
no message
Merge pull request #6 from ysc0423/charlesy

from charlesy