First commit
Merge branch 'master' of https://github.com/easilyi/newGitTest
Merge branch 'feature1' of https://github.com/easilyi/newGitTest into feature1
nano and push pull test from mac