uploaded combat demo

work in progress. bad bad bad
working combat demo
Merged Ari+Zach's code with Aric+Victor's code. Not much else.
Merge branch 'master' into aric_sprint-0.5