Revert 579366e..f9e45b7

This rolls back to commit 579366e677df27982044996fab8954c49b375dcc.
Revert e5482e6..ab9d968

This rolls back to commit e5482e6412fa83e9c9b92ca9b3cae5284f9a803c.
Merge branch 'weapons' of https://github.com/GraspinglySilver/cslabfinal into weapons