Merge branch 'controller' into mauricio
Redid Tile
Got rid of fame points earned and elevation
Compile errors in MActions
Compile errors and warnings
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