Set hat tip to blue
Merge branch 'baleato'

Conflicts:
	img/claus.jpg