yolo
Merge branch 'master' of https://github.com/badowsky/rpi-scripts

Conflicts:
	therm_module/my_therm.c
Merge branch 'master' of https://github.com/badowsky/rpi-scripts

Conflicts:
	therm_module/my_therm.c