Added Area and Map classes, to be implemented more later with Terrain
Merge branch 'master' of git@github.com:dhill3/SoftwareEngineeringProject.git
Added Accuracy, and Statuses fields, added enter/exit battle methods
Pokedex and PokedexEntry classes
Recommitting classes
Merge remote-tracking branch 'tpowell/master'

Conflicts:
	SoftwareEngineeringProject/.settings/org.eclipse.jdt.core.prefs
	SoftwareEngineeringProject/junit/edu/ycp/cs320/SoftwareEngineeringProject/PokemonTest.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/Area.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/Pokemon.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/Terrain.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/main.java