something
Merge branch 'Richard' of https://github.com/OnTheSpotTeam/OnTheSpot1 into design
something
Saving maps work!