Added getters and setters to champ.h and champ.cpp.  Altered naming conventions for classes and functions to be more standard. May be overwriting factory changes by accident here.
Merge branch 'develop' of https://github.com/cjfshaw/JungleSim into develop

Conflicts:
	Project2/MonsterFactory.cpp
	Project2/MonsterFactory.h
	Project2/main.cpp