new branch adrian
Merge branch 'master' of https://github.com/aydex/Odd-Game into adrian
making new branch
initial commit
test
test
rm test
Small changes to combat class, before branching
Continued work on combat class and graphics
Merge branch 'master' of https://github.com/aydex/Odd-Game.git
Major overhaul of combat and combat graphics class. Combat system almost
done
Merge pull request #1 from aydex/martin

Martin
Merge branch 'master' of https://github.com/aydex/Odd-Game.git
changed party, and added images for the gameworld
Merge pull request #2 from aydex/odd

Odd
tried to replicate Odd's member changes
Merge branch 'master' of https://github.com/aydex/Odd-Game.git
Made some further changes to combat and combatGraphics class, mainly
concerning the logic of combat
Merge branch 'master' of https://github.com/aydex/Odd-Game.git
Minor changes to combat class, and addition of one method to member
class
Added what was needed in World, Grid and GraphicsControl to show the
board and taking correct user input.