improved main page and added gMaps
fixed gitignore conflict