Modif Main.java
Merge branch 'master' of https://github.com/Stakzz/Abalone.git

Conflicts:
	src/Main.java