added fire effect to phoenix
stuff
Merge branch 'master' of https://github.com/delorenzo/Rebirth

Conflicts:
	Level 1/Assets/LVL1_MAIN.unity
	Level 1/Library/AssetServerCacheV3
	Level 1/Library/InspectorExpandedItems.asset
	Level 1/Library/assetDatabase3
	Level 1/Library/expandedItems
	Level 1/Library/guidmapper
	Level 1/Library/metadata/01/0124ea26d0f1ae849a5a2879d560b1b3
	Level 1/Library/metadata/01/01c7acc3dc9e42146bbfec42cd419fa9
	Level 1/Library/metadata/03/0371a87f25a8ce64697f1ba82f4a9316
	Level 1/Library/metadata/05/053f59eb69daa8b499a80815f3e7daf1
	Level 1/Library/metadata/06/06c6826e710a00740b62efb04baad67b
	Level 1/Library/metadata/0e/0ed391e7071b8dd49b681fb3ce9ef828
	Level 1/Library/metadata/13/1382d110fe2426c49a6820f7f7cda2e4
	Level 1/Library/metadata/15/15a97bf8b75e12a4b818ec48c1f85025
	Level 1/Library/metadata/1a/1a00105e0cf9b5d49830c94e64809639
	Level 1/Library/metadata/1a/1a17e3c648cd3664393c2e61c2c227ef
	Level 1/Library/metadata/1c/1c651aafbef251449b3021fb9a743cce
	Level 1/Library/metadata/23/23182480fc2acbf4c9a9641bed7d7718
	Level 1/Library/metadata/25/25deee80ae497854e8662af84982f42d
	Level 1/Library/metadata/2b/2bb7cec664c679e49b36492cd124d602
	Level 1/Library/metadata/2c/2caaf00c1d5c5e447bba62c2bd777634
	Level 1/Library/metadata/2e/2e2c0a7acbec7a94c972c61f04d6e600
	Level 1/Library/metadata/2f/2f5fb1217cbe98f45a29dd3666378ebe
	Level 1/Library/metadata/36/360e82956072bcd40a0fc23771cb2304
	Level 1/Library/metadata/37/3738bdd14415f4147853b949d74acec3
	Level 1/Library/metadata/37/379d0cbde6faa39449865496118771b2
	Level 1/Library/metadata/3b/3b2089544f653da4a9707511944d72dc
	Level 1/Library/metadata/3b/3bf78f2f3d5c65f4e8b9f26544f2ddbf
	Level 1/Library/metadata/3c/3c5c9c2618874814089ab529fae3dc1b
	Level 1/Library/metadata/3d/3d1918ec933054145964cbcfa0bcad49
	Level 1/Library/metadata/3d/3de10c92765c0534683c85bb2596c008
	Level 1/Library/metadata/3e/3e891b078cf7f344d96bd05b02d591fb
	Level 1/Library/metadata/40/4084d0cb427f083419bd10e76da7ff5b
	Level 1/Library/metadata/41/419ec70f6d783a6469fd99384448404f
	Level 1/Library/metadata/45/4547032e46ac0e2419302302286643af
	Level 1/Library/metadata/45/454ad715db1c4424d9717883a23a9bcc
	Level 1/Library/metadata/48/482e7568c9520e749b6da517bb52cc73
	Level 1/Library/metadata/48/488af4f4378aa99438c164bff1ccef0d
	Level 1/Library/metadata/4d/4d73aa875ba93224f90e14dcb70bdd97
	Level 1/Library/metadata/56/5626e690b9ef85b4e906628aedf71c53
	Level 1/Library/metadata/5d/5d03d11b87b5da44c92942788d4ceb66
	Level 1/Library/metadata/64/64a31f3e33fec324b8f13cac54cedb39
	Level 1/Library/metadata/67/67d76abb3cb363d49a5284580f065684
	Level 1/Library/metadata/68/68bd696377e45034d95bcf1dec1a4021
	Level 1/Library/metadata/6a/6a64b6469dab1b64b9fab31e7b12de85
	Level 1/Library/metadata/6a/6a69dcf4be3e7e64a9dfedaaa23e062d
	Level 1/Library/metadata/6a/6a80df807bc84cb4893b0e647ca666d6
	Level 1/Library/metadata/6a/6ac27878b176d0d488f1f66220c95932
	Level 1/Library/metadata/6b/6b66fcd15a8ff99429496f6a342463d1
	Level 1/Library/metadata/6e/6e7210302fbcb7340ae03201c8280328
	Level 1/Library/metadata/6e/6eb48cd62c646034ab5df2b614041488
	Level 1/Library/metadata/6f/6f23ffc0e98b8a3409ee546f0ef4532c
	Level 1/Library/metadata/71/71e0fb57415f768418b9c3aaad48511e
	Level 1/Library/metadata/79/796687b3efc31f44dbbf541eaf352291
	Level 1/Library/metadata/79/79c41fedf14279443ad058ce16af5ba2
	Level 1/Library/metadata/7b/7bcb59db0b35a3b4eb0ecf3f89b0fada
	Level 1/Library/metadata/81/817356d2cf621324ca7cca2e52f2c805
	Level 1/Library/metadata/84/844808beffd48324593ea8d36c77652c
	Level 1/Library/metadata/84/84fdfb457de4fbd46ada0c02dd513b44
	Level 1/Library/metadata/85/851626e88668b554c9362b965fde2929
	Level 1/Library/metadata/87/87d88d3f39b8c6f4094dea5d1da90ce6
	Level 1/Library/metadata/8a/8a23f555c83c71f4284a2a14af488d4e
	Level 1/Library/metadata/90/90d6ca0a8319fd748a6737b4c080074d
	Level 1/Library/metadata/92/923fd3d708c366d468d8c0063a2e0442
	Level 1/Library/metadata/96/9641477a1d23298488187b836cae75f4
	Level 1/Library/metadata/97/970352de4864d6d4eb022c72488d8533
	Level 1/Library/metadata/98/983fc97c21b1e2846848f1b8acc76cb7
	Level 1/Library/metadata/a2/a20887733cd33a847a09b813bc6f4913
	Level 1/Library/metadata/a3/a3caef50f70a6b4479682303d52f3aa6
	Level 1/Library/metadata/a7/a7360981340b2d44290961debfb17075
	Level 1/Library/metadata/a8/a851098fdcc3a1743bbf50ecdbaee7df
	Level 1/Library/metadata/a9/a9a2761115322e34781afed47aed3f32
	Level 1/Library/metadata/aa/aa9200eeafa2f624a9ff99925ff2471a
	Level 1/Library/metadata/ac/acc80070bc7c4d340bd85003021fada8
	Level 1/Library/metadata/ad/adb6259b1f9d2f947a2a42185ba28913
	Level 1/Library/metadata/ad/adff9723aa078394ebbad42118aefd4d
	Level 1/Library/metadata/ae/aec903518a04113408bf4fa6db11ee18
	Level 1/Library/metadata/b4/b4410b63a52432848ac11dd25571ca78
	Level 1/Library/metadata/b5/b50574805ee124f4db875135bfa14327
	Level 1/Library/metadata/b5/b53d4ee904824824eb9a65c0de6dcbe6
	Level 1/Library/metadata/b9/b9e3fec42a7df704997edf29ad759632
	Level 1/Library/metadata/ba/ba7e16c4bc5da3b4c902b60c56bce651
	Level 1/Library/metadata/bb/bbe045ddd084f2042a8f6f4d8d252e28
	Level 1/Library/metadata/be/beccab0e739b7824495b6d8667ac0238
	Level 1/Library/metadata/c1/c11d4a818c2e56e418d36f265ca9cee2
	Level 1/Library/metadata/c1/c1e35ffe8605e324aa16c8dafb35392f
	Level 1/Library/metadata/c4/c4cf90b46e7ce884284b08a67e67607c
	Level 1/Library/metadata/c6/c658ee19c7fc19540a63c3c6b2c23d76
	Level 1/Library/metadata/c8/c82acbe9ff01f4e43b3251280acf7594
	Level 1/Library/metadata/ca/ca03c2a538a8130458be366e9c5aa394
	Level 1/Library/metadata/cb/cb39ce508f9cce14589f7b540411f1ab
	Level 1/Library/metadata/d1/d1096f8da6096594bae55c2ce0ec9806
	Level 1/Library/metadata/d3/d318ec83cf3ffcb4894285b618cd9055
	Level 1/Library/metadata/d7/d757635ffafc95f4d90841fab3ba5916
	Level 1/Library/metadata/d7/d7da21493b330a8458adfcfeeb9bbfb8
	Level 1/Library/metadata/da/da4fdebc3c07a3042b40dc952eefec65
	Level 1/Library/metadata/de/de08d3a26119d024d898664392119f3e
	Level 1/Library/metadata/df/df164e5a6c1029c42ada1f1207437aad
	Level 1/Library/metadata/e2/e268428884ea64e429b04938b1716d8d
	Level 1/Library/metadata/e2/e2e56ca1e198eb24d822680fc19bf5d3
	Level 1/Library/metadata/f0/f0fc960f536caa34482f1090b44eae06
	Level 1/Library/metadata/f5/f547fc737d2c11d4ba6a064b7b712e05
	Level 1/Library/metadata/f6/f61d826f020126e42865f68c358e5846
	Level 1/Library/metadata/f6/f6e15197e34259041bfadde8475e2e69
	Level 1/Library/metadata/f8/f8c9cf7fb3a66e542b56c30a09870cf7
	Level 1/Library/metadata/fc/fc0e8a41fd0f8254fb7d9522907a9779