update main
Update main.cpp
update encounter

converting into a class system
update encounter.h
Update combat.cpp
Update combat.h
Update combat.cpp
Update combat.cpp
Update combat.h
Update encounter.cpp
Update encounter.h
Merge pull request #6 from Wizard-Ware/fixing-story

Tweaking