need to commit to get the new changes!
Merge branch 'master' of github.com:AmandaSutherland/ShoeStalker
haven't done anything but git
fixing conflicts
test
removed comment
removed comment
added comments
fixing...
Merge branch 'master' of https://github.com/AmandaSutherland/ShoeStalker

Conflicts:
	ShoeStalker.py
Merge branch 'master' of https://github.com/AmandaSutherland/ShoeStalker
....