just commiting
Merge branch 'Cammode' of https://github.com/OlinRoboticsAndBioinspiration/dynaroach into Cammode

Conflicts:
	python/dynaroach.py
commented motorsetup and dflashtest that we have added