adding light dimmer again, and trigger maker, made fishcharactercontroller prefab to work better, same w/ doug bat controller
changing fishcharcontroller
Merge branch 'master' of https://github.com/Flux159/Polymorph

Conflicts:
	PolymorphGame/Assets/Scenes/BaseScene.unity