fixes matchmaster stuff (hopefully)
Boomerang completed functionality
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/CharacterStuff/GSAS/Boomerang.cs
	Assets/CharacterStuff/GSAS/GSAS_B_Behavior.cs
	Assets/CharacterStuff/GSAS/Resources/Boomerang.prefab
	Assets/New Terrain.asset
Fuck dude, it's late. Shield stuff nearly done. Need to do more tomorrow
not much
Finalized shielding and shield poking
falling bug
Changed knock back scaling
fixed shield raise bug
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo
GSAS.mb file added
hey how's it going
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo
More menu niceness, should be ready for gamefest
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo
Areal bug fix
Tuturu. http://tehurn.com/tuturu
new model and animations!!!! :D
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/CharacterStuff/AllBehaviors/FallingBehavior.cs
Added stage colliders, modified terrain