my commit
Merge branch 'master' of https://github.com/Fonserbc/NGJ14

Conflicts:
	NordicGameJam/Assets/Resources/Shaders.meta
	NordicGameJam/Assets/Resources/Textures.meta
	NordicGameJam/Assets/Resources/Textures/Background_Test_02_NRM.tif.meta
	NordicGameJam/Assets/Resources/Textures/Levels/Level_1/Level Build Disclosure Lvl1_room1_Alpha.tif.meta
	NordicGameJam/Assets/Resources/Textures/Levels/Level_1/Level Build Disclosure Lvl1_room1_DIFF.tif.meta
	NordicGameJam/Assets/Resources/Textures/Levels/Level_1_Room_3.meta
	NordicGameJam/Assets/Resources/Textures/Levels/Level_1_Room_3/Lvl1_Room3.tif.meta
	NordicGameJam/Assets/Resources/Textures/ToonRamp.png.meta
	NordicGameJam/ProjectSettings/EditorBuildSettings.asset
	NordicGameJam/ProjectSettings/ProjectSettings.asset
	NordicGameJam/ProjectSettings/TagManager.asset