mise en place du style de choix place
petit conflit git résolu

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

Conflicts:
	theatre/src/com/gr15/filters/RestrictionFilter.java