commit avant qui pull
Merge branch 'master' of https://github.com/Dracir/semicolon

Conflicts:
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/ProjectSettings.meta
	Assets/Scenes/Gym/Statement tests.unity
Merge branch 'master' of https://github.com/Dracir/semicolon
TextCollider2D upgradeeeee