Merge pull request #117 from ZomgPonies/master

sync
Merge pull request #118 from ZomgPonies/master

Sync
supermatter drill

New traitor item
Merge pull request #119 from ZomgPonies/master

sync
Sparkyninja's beret
-SM drill

commented out the supermatter drill until we can find a use for it/a way
to balance it
Merge pull request #466 from melandor0/paradise

supermatter drill