I forget... changes from friday... awkward...
Merge branch 'master' of https://github.com/AmandaSutherland/ShoeStalker

Conflicts:
	ShoeStalker.py