Game with light and colors
test_test
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game/Assets/Scenes/00_Base.unity
	Game/Library/CurrentLayout.dwlt
	Game/Library/assetDatabase3
	Game/Library/expandedItems
	Game/Library/guidmapper
	Game/Library/metadata/cb/cb2ad622ddc15124fb2d5572601420db
Merge branch 'master' of https://github.com/Alexandervc/GameJam-13-11

Conflicts:
	Game/Library/CurrentLayout.dwlt
	Game/Library/assetDatabase3
	Game/Library/expandedItems
Merge branch 'master' of https://github.com/Alexandervc/GameJam-13-11

Conflicts:
	Game/Library/CurrentLayout.dwlt
	Game/Library/assetDatabase3