haven't done anything but git
Help amanda? It works?
fixing conflicts
Merge branch 'master' of https://github.com/AmandaSutherland/ShoeStalker

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

Conflicts:
	ShoeStalker.py
Code that includes teleop and new structure of stalk. will not work
Merge branch 'master' of https://github.com/AmandaSutherland/ShoeStalker

Conflicts:
	ShoeStalker.py