Merge branch 'master' of https://github.com/oksktank/gamptermprojet

Conflicts:
	Assembly-CSharp-vs.csproj
	Assets/Scenes/main.unity