Committ before attempted merge with Derrike
Tenatively merged Derrikes changes
Committ with derrikes changes. Realized function was repeated. Removed
reset
test
commit
Merge branch 'master' of
git@github.com:maloney626/SoftwareEngineeringProject.git

Conflicts:
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/Battle/Battle.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/GUI/TempMapPanel.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/GUI/Terrain.java