not sure what this is for
Merge branch 'master' of https://github.com/nkornek/BossPants

Conflicts:
	Bosspants Unity/Bosspants Unity-csharp.sln
	Bosspants Unity/Bosspants Unity.sln
	Bosspants Unity/Bosspants Unity.userprefs
	Bosspants Unity/Library/CurrentLayout.dwlt
	Bosspants Unity/Library/InspectorExpandedItems.asset
	Bosspants Unity/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Bosspants Unity/Library/assetDatabase3
	Bosspants Unity/Library/expandedItems
	Bosspants Unity/Library/guidmapper