Merge
Merge branch 'master' of https://github.com/Deepercreeper/Schoolproject.git
#23: Weapon bug fixing.