organized
Merge branch 'master' of https://github.com/tlillies/vidro

Conflicts:
	flight_test.log
	pyvicon