update
Merge branch 'mads_dev'
shit.png added to Weapons class