Added Armors and updated Armor#Description
Typo
Merge branch 'master' into Armors
UML