Merge remote-tracking branch 'Joey/master'

Conflicts:
	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
Adding Pokemon tile picture for Tom to access
moveclass 1
Merge remote-tracking branch 'jmaloney/master'
Made a move class for moves
Merge branch 'master' of
git@github.com:dhill3/SoftwareEngineeringProject.git
Merge remote-tracking branch 'cfeltch/master'
Move class modified