Merging to get mauricio's changes
Merge branch 'controller' of https://github.com/ssyyddnneeyy/ChokingHazard-Iteration2 into controller
Last commit has selection of tiles to start working. Modified simulator to a bit slower
Created new test for selecting the tiles
Settling (silly) merge conflict in GameModel
Settling (silly) merge conflict in GameModel