testbranch
Merge pull request #1 from oXis/oXis

testbranch
Delete testbranch
Signed-off-by: Lunaria <goro27@hotmail.fr>
Merge branch 'master' into Lunaria

* master:
  Signed-off-by: Lunaria <goro27@hotmail.fr>
  Delete testbranch
  testbranch

Conflicts:
	Main.py

Signed-off-by: Lunaria <goro27@hotmail.fr>
Signed-off-by: Lunaria <goro27@hotmail.fr>