Merge pull request #2 from Roll20/master

update
Attack formatting
Armor and yet more formatting
Merge pull request #31 from alicia86/master

Armor, Attack and more formatting