merge
Merge branch 'master' of github.com:BinbinTang/Geomagicians_phase_2