Omlette script done!
1
Merge branch 'master' of https://github.com/s00tie/cooking

Conflicts:
	.gitignore
	Library/AnnotationManager
	Library/BuildSettings.asset
	Library/EditorUserBuildSettings.asset
	Library/EditorUserSettings.asset
	Library/MonoManager.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/0e/0e8050c12c581e647b0bc23a0cd5e7d5
	Library/metadata/2b/2bad404cd815cfa4f8c9cf91235fa2fe
	Library/metadata/46/46eca1da5ce4a004ebe9e2c5b986d84c
	Library/metadata/62/6237a6d86aac15141927df51d269ecb2
	Library/metadata/8d/8d1a48483e434a240861d12f5d07786e
	Library/metadata/92/9298dd7ec88903e47886fe0fa23f2860
	Library/metadata/bd/bd8a7c1744ed2a145902109bf676f502
	Library/metadata/f6/f6b7e5baae6dccc4d9e0d4065a83b581
	Library/metadata/fb/fbb5510e854b97444bd53b34640fa8e5