delete .DS_Store
merge updates 2.4
Merge branch 'master' of https://github.com/wyr4137/ICS5-Map