Fixed heal team
Joey. Rebase from me.
Joey. Rebase now!
Merge remote-tracking branch 'Cody/Finalish'

Conflicts:
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/client/LoginView.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/client/MapView.java