Merge branch 'controller' into mauricio
Merge branch 'controller' into mauricio
Merge branch 'controller' into mauricio
Merge branch 'master' into controller

Conflicts:
	src/Models/BoardModel.java
Merge branch 'controller' of https://github.com/ssyyddnneeyy/ChokingHazard-Iteration2 into controller
Merge remote-tracking branch 'origin'
Merge branch 'controller' into mauricio
Settled merge conflict in BoardModel
implemented and added methods to do checking for selecting tiles that are in sharedComponentModel
Merge remote-tracking branch 'origin'
fix
Merging with remote repository controller branch and settled merge conflict with BoardModel
Merge branch 'master' into controller
Merge
Merged controller to my name branch and settled (silly) merge conflict with SharedComponentController
Settling merge conflicts in BoardModel and SharedComponentController
Load Save Start
Merge branch 'controller' into mauricio
Merge branch 'mauricio' into controller
Fixed JavaPlayer conflict and did something in Tile