.Ignore this
Merge branch 'master' of https://github.com/araymer/SomeTowerDefense.git

Conflicts:
	src/Attackers/Cannoneer.java
	src/View/TilePanel.java
Merge branch 'master' of https://github.com/araymer/SomeTowerDefense.git

Conflicts:
	src/View/TilePanel.java
.
Merge branch 'master' of https://github.com/araymer/SomeTowerDefense.git

Conflicts:
	src/View/MainMenu.java
Added preview maps on MainMenu when buttons are clicked.
Merge branch 'master' of https://github.com/araymer/SomeTowerDefense.git

Conflicts:
	bin/Attackers/Marine.class
	src/Attackers/Cannoneer.java
	src/Attackers/Marine.java
	src/View/MainMenu.java