testing 2
Merge branch 'master' of https://github.com/iamsand/Othello

Conflicts:
	bin/othello/OthelloMain.class
	src/othello/Game.java
	src/othello/OthelloMain.java