Remade project - hopefully working! :)
Merge branch 'master' of github.com:TheNextGuy32/FoodFriends

Conflicts:
	Source/Library/AssetServerCacheV3
	Source/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Source/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Source/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Source/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Source/Library/assetDatabase3
	Source/Library/guidmapper
	Source/Library/metadata/01/01174e4954348268c150b6f98c48939f
	Source/Library/metadata/01/01b622d4830754f4886f4b03606fb1ec
	Source/Library/metadata/02/028c11450244e4feabe6828fc2ec3e03
	Source/Library/metadata/07/073946e94d57ac04fb345d5c28d21992
	Source/Library/metadata/08/086544326e5604e81a96f61fb0f0a78e
	Source/Library/metadata/08/08f28e42a647e2a4cbd32e793359aa3c
	Source/Library/metadata/0a/0a70c16c7b47ab048bc9e03b588c24f6
	Source/Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df
	Source/Library/metadata/0b/0b167d00b3108411a8a963cba5ddde1b
	Source/Library/metadata/12/12747bdca86d344c2a4f1ea2bb362f17
	Source/Library/metadata/14/144b203f383094d16b1f336c74c47326
	Source/Library/metadata/16/169b10ce10f4327cb9f40f6b117ed8d7
	Source/Library/metadata/1a/1a5d8cd24a805cd44b00c7f1e1e4d287
	Source/Library/metadata/1d/1d5ac211a643e447ca78c2d794a16381
	Source/Library/metadata/1e/1e3cbdfe3644f44aeb1c053d96cc254e
	Source/Library/metadata/23/2314ce3a3eecf4816bad3c9eca4de2e1
	Source/Library/metadata/27/27acebc9ad1110f6d00074c88d76c639
	Source/Library/metadata/29/29f2844e1d89a4ed09e527cd2039d6ea
	Source/Library/metadata/2a/2a49aa5b76842305fc65897abcdcf30f
	Source/Library/metadata/2a/2acf9c8e812eff6459715d2b3dce2c96
	Source/Library/metadata/2b/2b21364bb71d4eb4dbce6894c82cd119
	Source/Library/metadata/32/327835a878f496675e402fdba3e0a4bc
	Source/Library/metadata/34/34c9fcec00ce63b49a6725d4eadead19
	Source/Library/metadata/3c/3c5bb2bad5622497490fdbd0f36e9674
	Source/Library/metadata/3c/3cadc5c144b6941fd9b94e6f6cbaa3cc
	Source/Library/metadata/3d/3ddb50e323b793449ad89bd605735e35
	Source/Library/metadata/3f/3fbc34d51ee4155dc17d8f49133f44ad
	Source/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	Source/Library/metadata/44/44b3febaf5142a5429938ef0a0de2395
	Source/Library/metadata/46/46e871058d317418fab60bb84a290869
	Source/Library/metadata/4b/4b31b1caadab1ee4b8606c9f35713992
	Source/Library/metadata/4e/4efe5620a91cf9542993ee04a027a7f5
	Source/Library/metadata/51/510306bf62c654a548c9d0193dbedd8e
	Source/Library/metadata/53/531c14f8d5cdc4e5baa83ee6e16f783a
	Source/Library/metadata/54/54216e9ed42974e30967824b7f0b2806
	Source/Library/metadata/54/542f86e4e34b523499e0f073b1355e1a
	Source/Library/metadata/56/5692846c5ce8f4ee08ef64bec4aad0bd
	Source/Library/metadata/5a/5a09dad89d11389ed000e82b8d76c639
	Source/Library/metadata/5c/5c54115eb5a2a4c4fb1b11b8e6100bd8
	Source/Library/metadata/60/60bca8f58a0b8478e946e6e86658cb29
	Source/Library/metadata/60/60fb16895cbaf4946906b6d63f3653ec
	Source/Library/metadata/62/62f7c8a57ece2204695f3c7dc963d23c
	Source/Library/metadata/64/642367443312c224bb40c297365867ac
	Source/Library/metadata/65/65836931803ab5b4fb9f60bd418f4100
	Source/Library/metadata/65/65fb74f285bbb4d11a3b64d99c0a53b0
	Source/Library/metadata/66/6685d213dcd37451eaa7643f63089046
	Source/Library/metadata/67/6793afeb1ba524134ae93ee3038763e0
	Source/Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639
	Source/Library/metadata/6e/6e77d387966489d6cb6bb6ba39e09c45
	Source/Library/metadata/74/74bcba72c2286ce429281c86d5928418
	Source/Library/metadata/74/74f4a47fc3b034e2d963491f4e514174
	Source/Library/metadata/79/79ee47d0d7d8347459a63ae804788244
	Source/Library/metadata/7a/7a598717ded698c4dbdd57c2260fa1e1
	Source/Library/metadata/7b/7b277829b0b4991f100024a80dbc5c14
	Source/Library/metadata/7c/7c98ffa948c8d43d5ac42a3e9f0ea897
	Source/Library/metadata/7d/7dca5dff796eb47908302d505dcb19b0
	Source/Library/metadata/7e/7e0b0a994d8934541a387e092630b5db
	Source/Library/metadata/7e/7e3669cf306c78f48a1f9affe08eb0f9
	Source/Library/metadata/82/820a38890d8f1f742b289b29927ffb3b
	Source/Library/metadata/85/85cde262bee344ae28a0bf86762219ac
	Source/Library/metadata/86/8600316ae23e146108aa156f81a2d56f
	Source/Library/metadata/86/8636e662e0f7d440fa257e9dce592504
	Source/Library/metadata/88/88324f760c579473199bfbc4f1073097
	Source/Library/metadata/88/885b1972ad11a921d000d37b8d76c639
	Source/Library/metadata/8a/8a4debc9ad1110f6d00074c88d76c639
	Source/Library/metadata/8c/8c1f929571ef549619212d9405d4f923
	Source/Library/metadata/8e/8e303788a4e296443b33942a5be85049
	Source/Library/metadata/8e/8e3ff3e27ca4bc54dda56e89e0550dfa
	Source/Library/metadata/92/92e6d9926a8c43d49a79f0d3d603277a
	Source/Library/metadata/96/96558d9af5ccba84da0a06dc9afa072d
	Source/Library/metadata/97/97b050d43ac7c4d2b9f6cbb587650761
	Source/Library/metadata/9b/9b9106e5cf82342e78e4fcc288becd41
	Source/Library/metadata/9c/9c5bd6070cd5d481abdb8755ff51fd7a
	Source/Library/metadata/9c/9c7f793f82a4f7bda3662a9a2f23142e
	Source/Library/metadata/9d/9d4133d5d30b644bd87802a347eaccbe
	Source/Library/metadata/a2/a28540d6bcf674c1bb3dd7af7de640fc
	Source/Library/metadata/a2/a2c718cc17893da49b1fb80ec6df9918
	Source/Library/metadata/aa/aadd99b5f57c2486b98d31bcbb5c640e
	Source/Library/metadata/ac/acd22cefe09441d2c7e801193b935495
	Source/Library/metadata/ad/ad90f586d4fe1b942b46f0da520a0e61
	Source/Library/metadata/af/af4465c7aa1400a6573c907831d716c9
	Source/Library/metadata/b3/b365e6042890d4b1987423ed6bb8a08c
	Source/Library/metadata/b9/b9a268fc98c474f721ff8c9bf8f5160e
	Source/Library/metadata/bb/bb393e804ad0e204cb1fcfbc9b8b0409
	Source/Library/metadata/bd/bd943c792514675e464dfc7a8c26d3e0
	Source/Library/metadata/c3/c31fa1a55f0c141ccb34e61d6bb78569
	Source/Library/metadata/c7/c78b114ae617a4914a6f9b9e0f796a0b
	Source/Library/metadata/c8/c81df2918c80c054ca3d436e62090893
	Source/Library/metadata/c8/c8634e062924929664361c08745211fb
	Source/Library/metadata/c9/c994fde8e6848a3771503f184e0c9cb4
	Source/Library/metadata/ca/ca49380a71a2bb64c830d06bd421b9d1
	Source/Library/metadata/ca/caa1ec025a7c049ec8f67b889fb33a6d
	Source/Library/metadata/ca/cae09c86ad1122e5d0006ac98d76c639
	Source/Library/metadata/ca/caf20877f7cce4351a9b1cfef8dcd186
	Source/Library/metadata/d2/d236c2e07976ff942a0e23d979e8f4cb
	Source/Library/metadata/d3/d3b7d84ffb95cc04aaeb74f19a10f034
	Source/Library/metadata/d5/d5396a3251db948279e0c7262385dafe
	Source/Library/metadata/da/da93ddd6928094e24bb1f3f665f143d3
	Source/Library/metadata/df/df42ef794d3e0441783057cf822a525c
	Source/Library/metadata/e0/e02bf8d8fe18948ea8ce546b6a32bee5
	Source/Library/metadata/e0/e097e0ca551c28647a5a126e44c35bbc
	Source/Library/metadata/e4/e4e4cff51dff43545953848c2258e62c
	Source/Library/metadata/e5/e53c8c3dcc4ff59438bc9e86cb45c3f6
	Source/Library/metadata/e6/e667992b28845df99060a8f876d1d11b
	Source/Library/metadata/e7/e79b4ee3b7b31ee499b1532270c7730d
	Source/Library/metadata/e7/e7d408c28925be148bd9ef32f4f28e44
	Source/Library/metadata/e8/e83c2f831bb0fd14b92751cdcbe823ec
	Source/Library/metadata/e9/e976c6d3ebc1e4a85aa7186a3192d8c5
	Source/Library/metadata/e9/e9b2eead3d2f84ce19c1d65f1dbf66f9
	Source/Library/metadata/f3/f3d66f34459704a34b36657da3964ea1
	Source/Library/metadata/f6/f60723ea36fc34476899abc83a5309c9
	Source/Library/metadata/f7/f781c091d1c8647c380d5230adfaee54
	Source/Library/metadata/f8/f89a53f13e64bbbd73bd6eb9f8509a09
	src/Library/CurrentLayout.dwlt
	src/Library/ScriptMapper