feature1 change
master changer
fixed
Merge branch 'master' of github.com:812872970/GitStore
changed locally