New Scene: Bob's Test Kitchen. Lounge Interior Decorated
set timer to start time when StartTimer is called.
Narrator Audio components, Lounge Decoration
Merge branch 'master' of https://github.com/s00tie/cooking into merge

Conflicts:
	Assembly-CSharp-firstpass.pidb
	Assembly-CSharp.pidb
	Assembly-UnityScript-firstpass.pidb
	Assets/Audio.meta
	Assets/Materials/GrapesÃ²Ã¥Ã¬Ã­Ã»Ã©.mat.meta
	Assets/Materials/ÃªÃ®Ã°Ã¥Ã¸Ã®Ãª.mat.meta
	Assets/Scripts/055869-black-ink-grunge-stamp-textures-icon-food-beverage-toaster.png.meta
	Assets/Scripts/Materials.meta
	Assets/Scripts/Toaster_Texture_002_by_nocreditstock.jpg.meta
	Assets/Scripts/bin.meta
	Assets/Scripts/bin/Debug.meta
	Assets/Scripts/chiabatta_bread_1011138.JPG.meta
	Assets/Scripts/crosshair.png.meta
	Assets/Scripts/photo-1815249.gif.meta
	cooking.userprefs
Continued working on flower mini game.
Mini Game functioning
I can't remember
Merge remote-tracking branch 'origin/nick'
Befoe the RALPH integration
Merge branch 'master' of https://github.com/s00tie/cooking

Conflicts:
	Assets/Scenes/RALPH_TEST_A1.unity.meta
	Assets/Scenes/Test_Main_GreyBox_M1.unity
	Assets/Scenes/food_find(Mini Game) (2).unity.meta
	Assets/Scenes/food_find(Mini Game).unity (2).meta
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/00/00000000000000003000000000000000
	Library/metadata/06/06a98ab734549484680b44d5c56c6212
	Library/metadata/2b/2bad404cd815cfa4f8c9cf91235fa2fe
	Library/metadata/31/31552b1c0d52b6f408ec6ab482889532
	Library/metadata/46/46eca1da5ce4a004ebe9e2c5b986d84c
	Library/metadata/65/65f07609a45012d4fa3e7330a695a071
Using new RALPH model
starting character swap (maybe)
merged?
updating gitignore
Intro narration, Ambient Spaceship Audio, Lounge Music added
deleted everything
after the crash
broke gitignore
more breaking
Merge branch 'sam' of https://github.com/s00tie/cooking into merge

Conflicts:
	Assembly-CSharp-firstpass.pidb
	Assembly-CSharp.pidb
	Assembly-UnityScript-firstpass.pidb
	Assets/Materials/Bronze.mat.meta~origin_nick.meta
	Assets/Scenes/Bobs Test kicthen Scene.unity.meta
	Assets/food_find(Mini Game).unity.meta
	cooking.userprefs