Merge branch 'controller' of https://github.com/ssyyddnneeyy/ChokingHazard-Iteration2
Merge branch 'master' into controller
First few method calls
Merge branch 'controller' into mauricio
Added interface for selecting a three piece tile in SharedComponentModel
Implemented select 3 tile action with SharedComponentController
Merge remote-tracking branch 'origin' into meghan
Merge branch 'master' into controller
Merge branch 'controller' into meghan
Changed to match functionality of only decrementing SharedComponent attributes when the tile has been placed, not when it is selected
Some more for Palace
Created MActions (momentary) for select actions the player can do
Changes to change to MActions for selected actions
Merge remote-tracking branch 'origin' into controller
Merge branch 'controller' into meghan
More Palace Stuff, Testing
Merge remote-tracking branch 'origin'
Merge branch 'mauricio' into controller
Merge remote-tracking branch 'origin' into controller
Merge branch 'master' into controller

Conflicts:
	src/Models/BoardModel.java