skasowanie tego co wybudowane
Merge remote-tracking branch 'origin/master'

Conflicts:
	TheMightyMarian/The Mighty Marian Rocket Test
2_Data/Managed/Assembly-CSharp.dll
	TheMightyMarian/The Mighty Marian Rocket Test
2_Data/Managed/Assembly-UnityScript-firstpass.dll
	TheMightyMarian/The Mighty Marian Rocket Test
2_Data/Managed/Assembly-UnityScript.dll
	TheMightyMarian/The Mighty Marian Rocket Test
2_Data/PlayerConnectionConfigFile
	TheMightyMarian/The Mighty Marian Rocket Test 2_Data/level0
	TheMightyMarian/The Mighty Marian Rocket Test 2_Data/level1
	TheMightyMarian/The Mighty Marian Rocket Test 2_Data/level2
	TheMightyMarian/The Mighty Marian Rocket Test 2_Data/level3
	TheMightyMarian/The Mighty Marian Rocket Test 2_Data/mainData
	TheMightyMarian/The Mighty Marian Rocket Test 2_Data/output_log.txt
	TheMightyMarian/The Mighty Marian Rocket Test 2_Data/resources.assets
	TheMightyMarian/The Mighty Marian Rocket Test
2_Data/sharedassets0.assets
	TheMightyMarian/The Mighty Marian Rocket Test
2_Data/sharedassets1.assets
	TheMightyMarian/The Mighty Marian Rocket Test
2_Data/sharedassets2.assets
	TheMightyMarian/The Mighty Marian Rocket Test
2_Data/sharedassets3.assets
	TheMightyMarian/The Mighty Marian Rocket Test
2_Data/sharedassets4.assets