almost butts
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo
GSAS OP, gotta nerf. also gotta use dem controllers PC gaming master race
Merge  reg poop branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/CharacterStuff/GSAS/dPad_texture.jpg.meta