Merging files
Merge branch 'master' of https://github.com/Gapti/MonsterClinic

Conflicts:
	Monster Clinic/Assembly-CSharp.pidb
	Monster Clinic/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Monster Clinic/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Monster Clinic/Library/ScriptAssemblies/Assembly-CSharp.dll
	Monster Clinic/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Monster Clinic/Library/assetDatabase3
	Monster Clinic/Library/metadata/5d/5de100e7a9bae3a44a1019e046b33403
	Monster Clinic/Library/metadata/9b/9b0f9adc4ea656b4a92f871651a2d122
	Monster Clinic/Monster Clinic-csharp.sln
	Monster Clinic/Monster Clinic.sln
	Monster Clinic/Monster Clinic.userprefs