some chanages
:a
:q
:wa
some changes
:q
Merge branch 'master' of github.com:mingxiao/gp-test