test
fucking git
it's collapsing...

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

Conflicts:
	theatre/src/com/gr15/servlets/ChoixPlace.java
Merge branch 'master' of https://github.com/rdubigny/projet_web.git