my first commit
exclude large files
Adding subscribing capabilities for image from neato
made a few tiny changes. git is making me do this.
Merge branch 'master' of https://github.com/AmandaSutherland/ShoeStalker
load image for shoetalker
fixed merge conflicts
frustration
Merge branch 'master' of github.com:AmandaSutherland/ShoeStalker
i should pull
Added subscriber info for Neato image. not tested
again. git is making me do this.
Merge branch 'master' of https://github.com/AmandaSutherland/ShoeStalker

Conflicts:
	ShoeStalker.py
should resolve conflicts
Added subscriber info for Neato image. not tested
Merge branch 'master' of https://github.com/AmandaSutherland/ShoeStalker

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