messed with spawning
Merge branch 'master' of https://github.com/CatsFromMars/RubberDuckAdventure

Conflicts:
	Assets/Scenes/Test.unity
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/00/00000000000000002000000000000000
	Library/metadata/00/00000000000000003000000000000000
	Library/metadata/00/00000000000000004000000000000000
	Library/metadata/00/00000000000000004100000000000000
	Library/metadata/00/00000000000000005000000000000000
	Library/metadata/00/00000000000000005100000000000000
	Library/metadata/00/00000000000000006000000000000000
	Library/metadata/00/00000000000000006100000000000000
	Library/metadata/00/00000000000000007000000000000000
	Library/metadata/00/00000000000000008000000000000000
	Library/metadata/00/00000000000000009000000000000000
	Library/metadata/00/0000000000000000a000000000000000
	Library/metadata/00/0000000000000000b000000000000000
	Library/metadata/00/0000000000000000c000000000000000
	Library/metadata/06/064d7f3e8ae8baf44bb2d43b401e9201
	Library/metadata/0b/0bc3f24fa3402164ebc9047169d54b0b
	Library/metadata/19/19d8bcb128731fd43b69a549931fcf8d
	Library/metadata/29/29e2e05cdf243b5439c10a5057e8f183
	Library/metadata/38/3824552ce1d284f4c8122af738d7af2d
	Library/metadata/3e/3eebcc1b7f6c14e4a98a644c24b6af7c
	Library/metadata/51/51a3214b5bb49d64dbac8a55e09361c8
	Library/metadata/52/5246b87a7d370ef4cab40ddce61741f0
	Library/metadata/60/607426a9820414bfd8081fb22854dbd4
	Library/metadata/61/6185090bfbc30184bbc8cb95c4ade096
	Library/metadata/66/661996b5efca5ed4494001a16d24ebe5
	Library/metadata/75/75d5124c36d3e3041abb4b8f64da8068
	Library/metadata/84/844aa2f92b1dcff448f990fdf6491aa3
	Library/metadata/94/94690a57f1530114bb425aa255822f22
	Library/metadata/94/9471a5a618cc7964f9d670e3835116ac
	Library/metadata/a0/a0607a67eba09f941b6ba748f847652f
	Library/metadata/a7/a7c21f6290d9d7149be0b5f78da092ff
	Library/metadata/ac/ac702708a8c1a844097fe3117835b3a8
	Library/metadata/b3/b38e052d07f4338448b02ac0152aeb87
	Library/metadata/b5/b54138233a71e0c4a968b70cda20feaa
	Library/metadata/cd/cd903744296683b4094d1bad2cea22ed
	Library/metadata/df/df2f76f118f8bf248833a75b7ef8c61f
	Library/metadata/e3/e34059b5952b8334cba8c3f1e7e2f355
	Library/metadata/e9/e9adeb40a188c674580c17ca1aa0e95e
	Library/metadata/ec/ec19fb75421c6ad489ca77bb586d8268
	Library/metadata/f5/f57bc7ea17ffb224d87545bbc0ae7f61
	Library/metadata/f6/f63d027bcc12fb74c94de656b87d558b