euh.. conflit --
Merge branch 'master' of https://github.com/anticonsti/QuentinStayOut.git