adding to board
Merge branch 'master' into BoardDesign

Conflicts:
	src/main/java/Board.java