blackhole power implementing
Merge branch 'master' of https://github.com/RobbSteel/Lords-of-Distortion
SmokeBomb and almost working defection shield
Merge branch 'master' of https://github.com/RobbSteel/Lords-of-Distortion

Conflicts:
	Lords-of-Distortion/Assets/Scenes/LobbyArena.unity
	Lords-of-Distortion/Assets/Scenes/MainMenu.unity
fixing layers for traps
Blackhole working
Merge branch 'master' of https://github.com/RobbSteel/Lords-of-Distortion
Reworking Ice Trap
Merge branch 'master' into Jason

Conflicts:
	Lords-of-Distortion/Assets/Scripts/PowerSpawn.cs
ground break/ice explosion particles
Added a ground layer to the floors so players can't continuously jump while inside a power's trigger.

Ice Trap generates a slowing field, then freezes players after a few seconds.
Merge branch 'master' into Jason
Earthquake shatter particles
Quake Particles RPC'ed
Fixed some trap layers
Merge branch 'master' of https://github.com/RobbSteel/Lords-of-Distortion
Freeze trap has been buffed.
Black hole done.
Merge branch 'master' of https://github.com/RobbSteel/Lords-of-Distortion

Conflicts:
	Lords-of-Distortion/Assets/Prefabs/SmokeBomb.prefab
	Lords-of-Distortion/Assets/Resources/BlackHole.prefab
	Lords-of-Distortion/Assets/Scenes/StageTwo.unity
Merge branch 'Jason'

Conflicts:
	Lords-of-Distortion/Assets/JMO Assets/Cartoon FX/CFX2 Prefabs/Debris Hits/CFX2_GroundRockHit.prefab
	Lords-of-Distortion/Assets/Resources/FreezeTrap.prefab
	Lords-of-Distortion/ProjectSettings/TagManager.asset