dolls *hang out* properly
Merge branch 'master' of https://github.com/Noeyfan/Working

Conflicts:
	PsychoKiller/Library/metadata/8f/8f6c5c07410ef8649b49444f21d45f75
	PsychoKiller/PsychoKiller-csharp.sln
	PsychoKiller/PsychoKiller-csharp.v11.suo
	PsychoKiller/PsychoKiller.sln