Code complete

Removed the test driver and finished off the remainder of the code by
adding in xp and hp functionality, also added in combat