removes unnecessary files and corrects a bug with the maps lat&lon
a
fixes some some minor errors and resolves merge conflicts
resolves merge conflicts