first commit by Ang 07/24
Merge branch 'master' of https://github.com/steve9000gi/ActivityMap