not a very useful commit
burp
Merge branch 'master' of https://github.com/nkornek/BossPants

Conflicts:
	Bosspants Unity/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Bosspants Unity/Library/assetDatabase3
	Bosspants Unity/Library/guidmapper
	Bosspants Unity/Library/metadata/65/65a2fa2025aed6c4db1afea4a8c417b4