made a few tiny changes. git is making me do this.
Merge branch 'master' of https://github.com/AmandaSutherland/ShoeStalker
again. git is making me do this.
Merge branch 'master' of https://github.com/AmandaSutherland/ShoeStalker

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

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