Shitty Joysticks
Merge branch 'master' of https://github.com/IAmTipsy/DungerMan

Conflicts:
	DungerMan/Assembly-CSharp-vs.csproj
	DungerMan/Assembly-CSharp.csproj
	DungerMan/DungerMan-csharp.sln
	DungerMan/DungerMan.sln
	DungerMan/Library/CurrentLayout.dwlt
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	DungerMan/Library/assetDatabase3
asd

asd
Merge branch 'master' of https://github.com/IAmTipsy/DungerMan

Conflicts:
	DungerMan/Assembly-CSharp-vs.csproj
	DungerMan/Assembly-CSharp.csproj
	DungerMan/Assets/Standard Assets/Water (Basic)/Sources/Objects/Water
Plane.fbx.meta
	DungerMan/DungerMan-csharp.sln
	DungerMan/DungerMan.sln
	DungerMan/Library/AssetServerCacheV3
	DungerMan/Library/CurrentLayout.dwlt
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	DungerMan/Library/ScriptMapper
	DungerMan/Library/assetDatabase3
	DungerMan/Library/expandedItems
	DungerMan/Library/guidmapper
	DungerMan/Library/metadata/00/006a5f739d1105f6a000538a2aef8c59
	DungerMan/Library/metadata/04/047330f39d11745ad0004adb8d76c639
	DungerMan/Library/metadata/04/04b13f8da4f3e497fa11dce2fe83b59f
	DungerMan/Library/metadata/0d/0d2f50a8e0bb841a5aaa90ae55db8849
	DungerMan/Library/metadata/12/122323fd0b4b34fb8bde01cfd5909703
	DungerMan/Library/metadata/19/19afb704d4e27491088d64e1919c14eb
	DungerMan/Library/metadata/2a/2af574102e7334116a50a7d2f9b32c5f
	DungerMan/Library/metadata/2f/2fd60b04f7c434a4dafd253d09bfa783
	DungerMan/Library/metadata/30/30abebfd9bf1c49d8a2d26e61e66bc15
	DungerMan/Library/metadata/33/33850b67ffcaa4b6c9a7146e4be0b917
	DungerMan/Library/metadata/40/40b01469ebddf42bc84870ba2f3d8c4c
	DungerMan/Library/metadata/52/52b7d70b1de7c4ce09662b77c14d9fda
	DungerMan/Library/metadata/6b/6b436d069d11415d1100ab9b44295342
	DungerMan/Library/metadata/70/706eadfad28bc4c1c9bb137b31052b14
	DungerMan/Library/metadata/70/70a4c3571f5624280bd8605def97056d
	DungerMan/Library/metadata/81/81a0355cbe65b490e8c4a79b6dcd824a
	DungerMan/Library/metadata/82/82ff3482c96f849ec854ea193bc60887
	DungerMan/Library/metadata/84/8403d3349d112ba4d000be1be39e7c39
	DungerMan/Library/metadata/93/93dd8e1461a0a437ab891f4f4da6ffff
	DungerMan/Library/metadata/94/9485b0c79d11e2e4d0007da98d76c639
	DungerMan/Library/metadata/98/98c330f39d11745ad0004adb8d76c639
	DungerMan/Library/metadata/9d/9dccc8e8f0da4494991c26ef59019551
	DungerMan/Library/metadata/a5/a53cf5449d11a15d1100a04b44295342
	DungerMan/Library/metadata/ac/ac85670a1b2274f22905d6a43940371a
	DungerMan/Library/metadata/ad/ade2a179e9624422f86f38d38b030fca
	DungerMan/Library/metadata/b9/b9d00da42c1a14770bd40645c7178564
	DungerMan/Library/metadata/bb/bb92962ea107044518934224b22419dd
	DungerMan/Library/metadata/c2/c29038e3b302f4c70b1a4dbf508fa146
	DungerMan/Library/metadata/c2/c2ef94ff9d11915d1100a04b44295342
	DungerMan/Library/metadata/c5/c55afdc4a8a3b4890b07cc7d176510bb
	DungerMan/Library/metadata/c8/c8e96a067d1ef4982b454cf5a686f648
	DungerMan/Library/metadata/ce/ce8d79c79d11b8f9d00076e98d76c639
	DungerMan/Library/metadata/d7/d730576b1d19a495fb87897a11e11ffb
	DungerMan/Library/metadata/dc/dc7abfa0435174ded902b073322d67cc