added case for test
Merge branch 'upstream/master'

Conflicts:
	src/board.js