Merge branch 'master' of https://github.com/Enfisk/Flash-and-crash

Conflicts:
	FlashAndCrash/FcBuild1.exe
	FlashAndCrash/FcBuild1_Data/Managed/Assembly-CSharp-firstpass.dll
	FlashAndCrash/FcBuild1_Data/Managed/Assembly-CSharp.dll
	FlashAndCrash/FcBuild1_Data/Managed/Assembly-UnityScript.dll
	FlashAndCrash/FcBuild1_Data/PlayerConnectionConfigFile
	FlashAndCrash/FcBuild1_Data/mainData
	FlashAndCrash/FcBuild1_Data/sharedassets0.assets