add tmp is not ignore
Merge branch 'master' of github.com:zplufb/learngit