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

Conflicts:
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/Player.java
Merge branch 'master' of git@github.com:maloney626/SoftwareEngineeringProject.git
Created a testLocation class to effectively test all the methods in that
class as of now