almost butts
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo
Added texture to D-pad Boomerang and updated texture for GSAS player 2 on character select. Player 2 changes not seen in battle, though.
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
bunch of small things - fixed vertical axis controller porblums, balanced moves, made player kill bounds relative to Master, I dunno, stufffff...
Player 2 color changes
Down air animation file
cleaned up folders, made a platforms layer so each scene is changed,  preliminary  collision fixes
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/CharacterStuff/GSAS/GSASPrefab2.prefab
palette swap is just one prefab, menu and matchmaster code is cleaner/whatever
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/CharacterStuff/GSAS/GSASPrefab2.prefab
	Assets/Menu.unity
palette swap in character select now works
incorporated new Dair
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/Arenas/TestStage2/Test Stage 2.unity
	Assets/CharacterStuff/GSAS/GSASPrefab1.prefab
	Assets/Misc/MatchMaster.cs
Resolution can now be changed (currently only 1920x1080 and 1600x900)
Flinch & Hit Stun animations imported
And Player 2 Dpad texture
Should now be able to work for any resolution supported by the monitor, modified the gameControl prefab to (hopefully) fix problems with characters not spawning correctly
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo
Hopefully fixes the GSAS spawning problem for real this time