second commit
new commit
Merge branch 'master' of http://github.com/jian-cui/temp