reset
Merge branch 'master' of https://github.com/Enlightment/Labyrinth7