test de merde
merde #2
Merge branch 'navbar'

* navbar:
  merde #2

Conflicts:
	test.html