sync
Merge branch 'master' of https://github.com/danieleorler/arduino_thermometer_ui

Conflicts:
	.gitignore
	arduinothermometer/templates/base.html