fixed
Merge branch 'master' of https://github.com/ramteid/gnublin-weatherballoon

Conflicts:
	temperature.py
Merge branch 'master' of https://github.com/ramteid/gnublin-weatherballoon