nico test 2

test 2 nico
herbe sur lune

fe
Merge branch 'master' of https://github.com/flousse/homazing

Conflicts:
	robin-coucou.txt
Merge branch 'master' of https://github.com/flousse/homazing
Merge branch 'labranchearobi' of https://github.com/flousse/homazing
photo
Merge branch 'master' of https://github.com/flousse/homazing
Merge branch 'nicobranche' of https://github.com/flousse/homazing