applied texture to cups, keycards, and thermometer
fixed sync conflicts

Conflicts:
	scaryHospital/Assembly-CSharp-vs.csproj
	scaryHospital/Assembly-UnityScript-vs.unityproj
	scaryHospital/Library/CurrentLayout.dwlt
	scaryHospital/Library/CurrentMaximizeLayout.dwlt
	scaryHospital/Library/assetDatabase3
	scaryHospital/Library/expandedItems
	scaryHospital/Library/guidmapper
	scaryHospital/Library/metadata/13/13bfbdc7c84861846993cb2d9ff55e37
	scaryHospital/Library/metadata/1a/1a5c6393b79481f479f1d2b7ce5dfb59
	scaryHospital/Library/metadata/1a/1a78bd08790f04f4398c861603ff252a
	scaryHospital/Library/metadata/25/256a3b62bce8a0449aefd1ed7bbe7902
	scaryHospital/Library/metadata/3f/3fcb2a3edea27114d9c7a092d25196b4
	scaryHospital/Library/metadata/50/505763b0e65cc2743bc493dbd1263796
	scaryHospital/Library/metadata/76/7622491e5f381ac4f883b54a75f72f33
	scaryHospital/Library/metadata/aa/aa6b7e7adf8e8f04ba0086d7592f151f
	scaryHospital/Library/metadata/c9/c93041a31941ae74dbbb69a7fb29c5de
	scaryHospital/scaryHospital-csharp.sln
	scaryHospital/scaryHospital.sln