#162
fixed some merge conflicts
Merge branch 'master' into board2DArray

Conflicts:
	tests/rhsu/board2/factory/BoardFactory.java
Merge pull request #175 from rhsu/board2DArray

Board2 d array