before merge
Merge branch 'master' of https://github.com/CansatLaCordi/CansatDeviceScripts

Conflicts:
	CansatSensorController.py
	cansatSensorController.py~