Added Ship Area; Lance Battle included and some flowers
Fixed Evolution and fixed initial Mapview initial stuff
Merge remote-tracking branch 'Cody/Finalish'

Conflicts:
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/PokemonClasses/Pokemon.java