More stuff was done
Merge remote-tracking branch 'Cody/master'

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