Merge remote-tracking branch 'origin/master'

Conflicts:
	MadClone/Assets/bg.png.meta
	MadClone/Assets/exit.png.meta
	MadClone/Assets/fuck.png.meta
	MadClone/Assets/main object.png.meta
	MadClone/Assets/options.png.meta
	MadClone/Assets/start eating.png.meta
	MadClone/Library/CurrentLayout.dwlt
	MadClone/Library/assetDatabase3
	MadClone/Library/guidmapper
	MadClone/Library/metadata/46/46828f2bcf10f374fa71b45a05c8a5fb
	MadClone/Library/metadata/58/5881daca02dfc4e46968895dff2cd81c
	MadClone/Library/metadata/6b/6bcea9bc88858df4aa4633169c914d7d
	MadClone/Library/metadata/6f/6fc32cecad3247849bf8fa7f17633403
	MadClone/Library/metadata/70/704e3872536c83a4ba1aa8e3a37620b2
	MadClone/Library/metadata/b3/b3a1e9237c11a6b4584d72f1203f18f9
	MadClone/MadClone-csharp.sln
	MadClone/MadClone.sln

Merge remote-tracking branch
'origin/master'

Conflicts:
	MadClone/Assembly-CSharp-vs.csproj
	MadClone/Assembly-CSharp.csproj
	MadClone/Assets/bg.png.meta
	MadClone/Library/ScriptAssemblies/Assembly-CSharp.dll
	MadClone/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	MadClone/Library/assetDatabase3
	MadClone/Library/guidmapper
	MadClone/Library/metadata/5c/5cc01a6a0da91b2499a89867c28d49c2
	MadClone/Library/metadata/a9/a9556a48a56e16948ab5bdeb454ef945
	MadClone/Library/metadata/b5/b589184976c33fe45aef6e2b263be51e
	MadClone/MadClone.userprefs

Merge remote-tracking branch
'origin/master'

Conflicts:
	MadClone/Assets/bg.png.meta
	MadClone/Assets/exit.png.meta
	MadClone/Assets/fuck.png.meta
	MadClone/Assets/main
object.png.meta
	MadClone/Assets/options.png.meta
	MadClone/Assets/start
eating.png.meta
	MadClone/Library/CurrentLayout.dwlt
	MadClone/Library/assetDatabase3
	MadClone/Library/guidmapper

Exit

Exit
Merge branch 'master' of https://github.com/Scha557/MADSOFT

Conflicts:
	MadClone/Library/metadata/46/46828f2bcf10f374fa71b45a05c8a5fb
	MadClone/Library/metadata/58/5881daca02dfc4e46968895dff2cd81c
	MadClone/Library/metadata/6b/6bcea9bc88858df4aa4633169c914d7d
	MadClone/Library/metadata/6f/6fc32cecad3247849bf8fa7f17633403
	MadClone/Library/metadata/70/704e3872536c83a4ba1aa8e3a37620b2
	MadClone/Library/metadata/b3/b3a1e9237c11a6b4584d72f1203f18f9