fixed
Merge branch 'master' of https://github.com/OnTheSpotTeam/OnTheSpot1 into Richard
Fixed file save(hopefully)
Merge branch 'master' of https://github.com/OnTheSpotTeam/OnTheSpot1 into Richard
Fixed image save.
something
Merge branch 'Richard' of https://github.com/OnTheSpotTeam/OnTheSpot1 into design
something