update 30 okt
Merge branch 'master' of https://github.com/larsmars/Weather-Station

Conflicts:
	ptc.py