*DISREGARD - GITHUB WEIRDNESS*
*DISREGARD - GITHUB WEIRDNESS*
*DISREGARD - GITHUB WEIRDNESS*
*DISREGARD - GITHUB WEIRDNESS*
*DISREGARD - GITHUB WEIRDNESS*
*DISREGARD - GITHUB WEIRDNESS*
*DISREGARD - GITHUB WEIRDNESS*
*DISREGARD - GITHUB WEIRDNESS*
Merge branch 'master' of https://github.com/lordubbe/OOSE_HandIn

Conflicts:
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/metadata/54/54344d4ec0c4b4734a13ec69325511d6
	OOSE_HandIn.userprefs