commit de la mort
some bugs fixed
Merge branch 'master' of https://github.com/RagnarLodbrok/HackathonStantum