checking branching shit again
Added getters/setters and modified current logic to use them instead of directly accessing data members.
Working with adding in the monsterfactory for production of monsters.  Currently not working when the monster is returned to main.
Update MonsterFactory.cpp
Update main.cpp
Update MonsterFactory.cpp
Update MonsterFactory.h
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
pushing to develop, need to make monster factory work
Merge branch 'develop'