inserted google maps angular, have it loading with no markers
merge confilcts resolved
Merge branch 'master' of https://github.com/QasAshraf/spawncamping-octo-dangerzone.git