Messing with things but want Jaspers changes
Merge branch 'master' of https://github.com/AmandaSutherland/ShoeStalker
apparently not up to date?
Merge branch 'master' of https://github.com/AmandaSutherland/ShoeStalker

Conflicts:
	ShoeStalker.py
OH MY GOD HOLY SHIT IT TRACKS THINGS LIKE CUPS
Merge branch 'master' of https://github.com/AmandaSutherland/ShoeStalker