added battle mechanics
Merge pull request #22 from pmarti28/master

added battle mechanics