fix some stuff + hack for the guichet collision
version code final
Merge branch 'master' of https://github.com/Cellule/PHS4700_Lab