picture backs out now
Merge branch 'master' of https://github.com/Noeyfan/Working

Conflicts:
	PsychoKiller/Assembly-CSharp-vs.csproj
	PsychoKiller/Assembly-CSharp.csproj
	PsychoKiller/Assets/Scenes/IntroScene.unity