Merge pull request #207 from ping19/master

Weapon display