laptop added python odometry
temp changes
Merge branch 'master' of https://github.com/mseskas/robotic

Conflicts:
	raspberrypiVNC.txt~
	ubuntu -> debian/main v0.1/c++ thread.layout
	ubuntu -> debian/main v0.1/src/activities/activities.cpp