It made me do it 0.0
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/Dev.unity
	Assets/Scripts/ManagersControllers/PlayerControls.cs
	Game2-csharp.v12.suo
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/metadata/47/470f10397994ce447b371dbf87edef14
	Library/metadata/c1/c1f987899ce8dd0419d05794e5750a14