test2
Merge branch 'master' of https://github.com/brazzerz/projet-tutore-image

Conflicts:
	bite.txt