added some stuff
new trial
mor
Merge remote-tracking branch 'origin/xloborg'

Conflicts:
	console/source/cmps10.c
	console/source/distanceAPI.c
	console/source/include/distanceAPI.h
	console/source/include/sensorconfig.h
	console/source/main.c
merged