new commit

can i merge?
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
another try

another try
Merge pull request #2 from Weishenghua/master

pull