Added lighting
Merge branch 'master' of github.com:Nexcius/ggj-hamar

Conflicts:
	Assets/Scripts/GUIChoiceRequest.cs
	ggj-hamar.userprefs