restructured code into Combat namespace
moved main program input into separate file
Merge branch 'master' of https://github.com/nicklink483/combat