Implemented regular damage calculation (partially) along with other
necessary changes
Merge branch 'master' of https://github.com/DarthPumpkin/pokemon-library.git