fixed javaPlayer conflict
fixed some methods in Board and Tile
Merge branch 'model' of github.com:ssyyddnneeyy/ChokingHazard-Iteration2 into model
fixed and finished the methods in Board