Fan lights added
Merge branch 'development' of https://github.com/PulseCollegeFirefly/Firefly into development

Conflicts:
	Assets/Scenes/IntroScene.unity