Create combat.h
create combat.cpp
create encounter.h
Rename main.cpp to Mastercopy.cpp
create encounter.cpp
Create main.cpp
Update encounter.cpp
Delete Mastercopy.cpp
update

cleaning main up with proper tabbing
Update encounter.h
Update encounter.cpp
Update combat.h
Update combat.cpp
Update main.cpp
Merge pull request #3 from autochthonexalt/master

Full conversion to header implementation