Just said hello.
Merge branch 'master' of https://github.com/CompJCDF/BasicMapping

Conflicts:
README.md
LOL
Merge branch 'master' of https://github.com/CompJCDF/BasicMapping