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
Fixed some trap layers
Merge branch 'master' of https://github.com/RobbSteel/Lords-of-Distortion