Merge pull request #1 from jpas/master

update dev
started to implement calculations
added spell like abilities
finished defense and info

also added a new character
added attacks
added attacks and fixed build formatting
Merge pull request #2 from jpas/calc

Added calculation