test conflict
Merge branch 'master' of https://github.com/rdubigny/projet_web.git

Conflicts:
	theatre/WebContent/test2.html