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

Conflicts:
	src/com/ataxx/controller/CellListener.java
Removed unused getters/setters