particle
Merge branch 'master' of https://github.com/FilipWrobel/Fortunate

Conflicts:
	Fortunate/Assembly-CSharp-vs.csproj
	Fortunate/Assembly-CSharp.csproj
	Fortunate/Assets/Prefabs/Player.prefab
	Fortunate/Fortunate-csharp.sln
	Fortunate/Fortunate.sln
	Fortunate/Fortunate.userprefs
	Fortunate/Library/CurrentLayout.dwlt
	Fortunate/Library/InspectorExpandedItems.asset
	Fortunate/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Fortunate/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Fortunate/Library/ScriptAssemblies/Assembly-CSharp.dll
	Fortunate/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Fortunate/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Fortunate/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Fortunate/Library/assetDatabase3
	Fortunate/Library/expandedItems
	Fortunate/Library/guidmapper
	Fortunate/Library/metadata/bd/bd53ccf7284dd954594d8cfc03c94bc5