Combat code for ben eath fixed
Merge branch 'master' of http://github.com/ben-eath/the-surf-ace