Added Google Maps Info
Fixed merge conflicts
Ignored Bin Directory