Add stuff
Merge branch 'master' of github.com:defuyun/myOwn
add map