some changes
something
Merge branch 'master' of https://github.com/OnTheSpotTeam/OnTheSpot1 into Richard