set timer to start time when StartTimer is called.
Continued working on flower mini game.
Mini Game functioning
Main scene update
Merge branch 'master' of https://github.com/s00tie/cooking

Conflicts:
	Assembly-CSharp-firstpass.pidb
	Assembly-CSharp.pidb
	Assembly-UnityScript-firstpass.pidb
	Assets/Materials/ÃªÃ®Ã°Ã¥Ã¸Ã®Ãª.mat
	Assets/Materials/GrapesÃ²Ã¥Ã¬Ã­Ã»Ã©.mat
	Assets/Scenes/Test_Main_GreyBox_M1.unity
	Assets/Scripts/FoodCollection.cs
	Assets/Scripts/FoodCollection.cs.meta
	Assets/Scripts/TimerUpdate.cs
renamed
merged
I can't remember
new RALPH model. finished #2
merge and fix gitignore
???
grrr
test_shapes for sam
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