Merge pull request #29 from jgoley/j_go

Adds functionality to weapon buttons