Converted weapon controls to final form
Merge branch 'master' of https://github.com/bflaherty88/CMP-150-Final