fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/dva217/shadowchess/app/BoardClasses/Board.java
fix