Combat summary

added combat summary - other minor bug fixes
Merge pull request #9 from favorspin/combatsummary

Combat summary