tacho 0 15 30 45 60 75 90
Merge remote-tracking branch 'origin/master'

Conflicts:
	06.operative.html
marge