Merge branch 'master' into controller
First few method calls
Merge branch 'controller' into mauricio
Some more for Palace
More Palace Stuff, Testing
Merge remote-tracking branch 'origin'
Merge branch 'mauricio' into controller
Merge branch 'master' into controller

Conflicts:
	src/Models/BoardModel.java
Merge branch 'controller' of https://github.com/ssyyddnneeyy/ChokingHazard-Iteration2 into controller

Conflicts:
	src/Models/BoardModel.java