Modif
Merge branch 'master' of github.com:NBlackout/Ataxx

Conflicts:
	src/com/ataxx/view/frame/MainFrame.java
Merge branch 'master' of github.com:NBlackout/Ataxx

Conflicts:
	src/com/ataxx/view/frame/MainFrame.java