Updated Armor
Merge branch 'master' of https://github.com/Adam8234/EmeraldTools