second commit
Merge branch 'master' of http://github.com/Ang-Li-al171/ActivityMap