Merge branch 'master' of https://github.com/uxizde/-

Conflicts:
	SwarmDataVisualization/Assets/scripts/Boid.cs
	SwarmDataVisualization/Library/CurrentLayout.dwlt
	SwarmDataVisualization/Library/ScriptAssemblies/Assembly-CSharp.dll
	SwarmDataVisualization/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SwarmDataVisualization/Library/assetDatabase3
	SwarmDataVisualization/Library/guidmapper

	SwarmDataVisualization/Library/metadata/84/84aa6b5d4ebaf294ab429217d6f94ce3

	SwarmDataVisualization/Library/metadata/cf/cf037f0b32925c0419eae2f332523ea5
	SwarmDataVisualization/SwarmDataVisualization-csharp.sln
	SwarmDataVisualization/SwarmDataVisualization.sln
	SwarmDataVisualization/SwarmDataVisualization.userprefs

fix merge

pre-base

rules have yet to be implemented