fixed formatting
Merge remote-tracking branch 'origin/class' into class

Conflicts:
	display/h100Display.py
	temperature/tmp102.py
fixed formatting