Sleeping
some changes
Merge branch 'Richard' of https://github.com/OnTheSpotTeam/OnTheSpot1
something
More tests
Merge branch 'Richard' of https://github.com/OnTheSpotTeam/OnTheSpot1
final
Merge branch 'Richard' of https://github.com/OnTheSpotTeam/OnTheSpot1