start of player class
test
Merge branch 'master' of
github.com:maloney626/SoftwareEngineeringProject

Conflicts:
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/Player.java