whatever
Merge branch 'master' of https://github.com/CatsFromMars/RubberDuckAdventure

Conflicts:
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/6e/6ed37a0a688467e47ac8987dfedf9412
	rubberDuckAdventure.userprefs
messing with spawn thresholds
Merge branch 'master' of https://github.com/CatsFromMars/RubberDuckAdventure

Conflicts:
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/1f/1f2de920a9521eb418a0e48e773ff124
	Library/metadata/2d/2d9c7c7b1a5004dff8e25f6c80afb203
	Library/metadata/52/5246b87a7d370ef4cab40ddce61741f0
	Library/metadata/88/880fd62c42689a249be10497e3f68f6d
	Library/metadata/ab/ab968452389b74d1885948d700264f61
	Library/metadata/ba/bac58fea7770a431ab78022e9b416acc
	Library/metadata/e3/e34059b5952b8334cba8c3f1e7e2f355
	rubberDuckAdventure.userprefs
added difficulty ramping over time
Merge branch 'master' of https://github.com/CatsFromMars/RubberDuckAdventure

Conflicts:
	Library/AssetServerCacheV3
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/00/00000000000000004000000000000000
	Library/metadata/00/005bf92898a30ae4a9546d9daefd12b2
	Library/metadata/10/102d61f81a4647c45959febbcec6ff46
	Library/metadata/19/19d8bcb128731fd43b69a549931fcf8d
	Library/metadata/1f/1f2de920a9521eb418a0e48e773ff124
	Library/metadata/2d/2d9c7c7b1a5004dff8e25f6c80afb203
	Library/metadata/38/38aa8c49437bf3649afca62809fc42da
	Library/metadata/3e/3ee2447c12240c741b214ef018b59546
	Library/metadata/52/5246b87a7d370ef4cab40ddce61741f0
	Library/metadata/61/61231b2f36b291b49a35339473d25504
	Library/metadata/6e/6ed37a0a688467e47ac8987dfedf9412
	Library/metadata/9d/9d374e5454217744eb609081ac522338
	Library/metadata/a7/a7c21f6290d9d7149be0b5f78da092ff
	Library/metadata/ab/ab968452389b74d1885948d700264f61
	Library/metadata/ba/bac58fea7770a431ab78022e9b416acc
	Library/metadata/cd/cd903744296683b4094d1bad2cea22ed
	Library/metadata/e3/e34059b5952b8334cba8c3f1e7e2f355