Merge pull request #1 from jiiis/jibaGong

change 1 in the local jibaGong branch
Merge pull request #2 from jiiis/master

change
Merge pull request #3 from jiiis/jibaGong_remote

Merge pull request #2 from jiiis/master
Merge pull request #4 from jiiis/master

change jibaGong back to master