merge the stupid fuck up branch
merging
Merge branch 'master' of https://github.com/henrybond158/Smart-Programming-Project

Conflicts:
	PiProgram.py