working on attackers
Merge branch 'master' of https://github.com/araymer/SomeTowerDefense.git

Conflicts:
	bin/Attackers/Marine.class
	bin/Model/Map.class
	src/Attackers/Marine.java
	src/Maps/BeachBetrayal.java
	src/Maps/BrokenPlainsPatrol.java
	src/View/TilePanel.java
Animation and logic updates
Merge branch 'master' of https://github.com/araymer/SomeTowerDefense.git