Transfer to laptop
jhgklj;k'
ghkjl;k'
Merge branch 'master' of https://github.com/Cryslo/EMSRisicoStage

Conflicts:
	EMSFireTrainer/Assembly-UnityScript-Editor-firstpass.unityproj