Merge branch 'master' into controller
Merge branch 'controller' into mauricio
Updated Action hierarchy with actionPointsCost attribute in Action
Updated MAction's pressEnter since Action's constructor now includes actionPointsCost attribute
Redid Tile
Fixing Action and MAction hierarchy and starting to implement select place tile on board
Got rid of fame points earned and elevation
Compile errors in MActions
Compile errors and warnings
Merge branch 'controller' of https://github.com/ssyyddnneeyy/ChokingHazard-Iteration2 into controller
Merge branch 'controller' into mauricio

Conflicts:
	src/Models/Actions/MActions/SelectTwoTileAction.java
	src/Models/Actions/OneSpaceTileAction.java
	src/Models/Actions/RotatableComponentAction.java
	src/Models/Actions/ThreeTileAction.java
	src/Models/Actions/TwoTileAction.java
Merge branch 'mauricio' into controller
Two Tile Action
Merge branch 'mauricio' into controller
Merge branch 'controller' into mauricio
Merge branch 'mauricio' into controller
Merge branch 'controller'