Added armor.d
Merge branch 'master' of https://github.com/msoucy/netslash
Merge branch 'master' of https://github.com/msoucy/netslash
Resolved conflict with weapon.d