hello
Merge branch 'API2' of https://github.com/Lighty04/friend_finder.git into API2
Data on Map