not sure what these are… possibly rollback to here
Merge branch 'master' of https://github.com/lizzb/kaffeeklatsch

Conflicts:
	Assembly-CSharp.pidb
	Assembly-UnityScript.pidb
	Assets/Scenes/Main.unity
	Kaffeeklatsch.userprefs
	Library/assetDatabase3
ahh conflicts what