Mad Dash set up
Merge branch 'Weapons'