Small changes to combat class, before branching
Continued work on combat class and graphics
Major overhaul of combat and combat graphics class. Combat system almost
done
Merge pull request #2 from aydex/odd

Odd