Created a modular menu system for selecting a primary and secondary weapon.
Merge remote-tracking branch 'origin/master'