sw
ok
Merge branch 'master' of https://github.com/ledinsA/Hexagoune

Conflicts:
	bin/Main.class
	src/Hexagoune.java
	src/Main.java
de