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 'cfeltch/master'

Conflicts:
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/Terrain.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/main.java
	
	merged changes from codys repository
Merge remote-tracking branch 'maloney626/master'
merged changes from joey
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
Fixed Effect Classes
Merge remote-tracking branch 'Cody/master'
Committing gitignore
Recmmiting gitignore
Recommitting gitignore
Added in Pokedex and Pokedex Entry Classes
Added ability to load a csv file into the Pokedex TreeMap, also the main
function will print out an instance of this map
moveclass 1
Merge remote-tracking branch 'jmaloney/master'
Made a move class for moves
Merge branch 'master' of
git@github.com:dhill3/SoftwareEngineeringProject.git