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
Fixed merge conflict
Merge branch 'master' into model
derp
fixed some bugs. The place tile methods seem to be working
fixed some bugs. The place tile methods seem to be working
Merge branch 'model' of github.com:ssyyddnneeyy/ChokingHazard-Iteration2 into model
Added Developer Methods
shmerp
Fixed Conflicts in BoardModel
Merge branch 'model' of github.com:ssyyddnneeyy/ChokingHazard-Iteration2 into model
Fixed error in removeDeveloper
Merge branch 'controller' into mauricio
Merge branch 'mauricio' into controller
Merge branch 'master' into controller

Conflicts:
	src/Models/JavaPlayer.java