New game after one ends
Merge remote-tracking branch 'origin/master'

Conflicts:
	BoardView.java