changed color on gmap markers
conflict resolved
Merge pull request #9 from Calliejb/gmap-markers

changed color on gmap markers