Merge pull request #26 from mysteriosum/master

a brief description/title
Merge pull request #27 from mysteriosum/master

chose bine
j'ai changer plein de truc pour le playtest de demain...room 3,4,6,7
Merge pull request #36 from Mchapuis/master

I get de changetzz