More sexyness to the taches shit
Merge remote-tracking branch 'origin/master'

Conflicts:
	chambres.html