tidied up old files
fixed merge
Merge branch 'master' of https://github.com/henrybond158/Smart-Programming-Project

Conflicts:
	docs/Gadgets Presentation Notes