added lights to the room map
Merge branch 'master' of https://github.com/AlexHayton/UnityTestProject2

Conflicts:
	Assets/3D Models/Levels/Materials.meta
	Assets/TestProject/Scenes/Ship.unity