recommit
commit all
Merge branch 'master' of http://github.com/zhongxiao/firstProject
Merge pull request #1 from zhongxiao/origin/master

Origin/master