synk
Merge branch 'master' of https://github.com/tetrakiss/Unity3d-2d-platformer

Conflicts:
	project/Assembly-CSharp-vs.csproj
	project/Assembly-CSharp.csproj
	project/Library/CurrentLayout.dwlt
	project/Library/assetDatabase3
	project/Library/guidmapper
	project/Library/metadata/bb/bb26ada6b7808431695592bcdeac78d3
	project/project-csharp.sln
	project/project.sln