add working
Merge branch 'Richard' of https://github.com/OnTheSpotTeam/OnTheSpot1
something
Added prompt
Merge branch 'master' of https://github.com/OnTheSpotTeam/OnTheSpot1 into Richard