elec added
Merge branch 'weaponMaster' of github.com:Babouchot/twerking-panzerbrigade into weaponMaster