mm

Startoflesson
Merge remote-tracking branch 'origin/master'

Conflicts:
	New Unity Project/Assets/Scen 1.unity
	New Unity Project/Assets/Spawner.meta
	New Unity Project/Library/CurrentLayout.dwlt
	New Unity Project/Library/CurrentMaximizeLayout.dwlt
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New Unity Project/Library/assetDatabase3
	New Unity Project/Library/expandedItems
	New Unity Project/Library/guidmapper
	New Unity Project/Library/metadata/14/140dfa4d8fc53594eba51f98f71d3afd
	New Unity Project/Library/metadata/1c/1c3b5619260a2234b86813d74ec62193
	New Unity Project/Library/metadata/1c/1caa583a29866064f9edacadf726ce51
	New Unity Project/Library/metadata/24/2476d329860f4c448b8370764f3aefb0
	New Unity Project/Library/metadata/34/34ce2b21e4311fe459426457debb639d
	New Unity Project/Library/metadata/36/36be08bcda168ba49b4ee013ed94feec
	New Unity Project/Library/metadata/3c/3c2c063370333174aaaf8042a8934e6f
	New Unity Project/Library/metadata/4c/4cdb033a6f4834a41a64fc354decf3ae
	New Unity Project/Library/metadata/57/5730e0b15f898a34f80f5d62068b986a
	New Unity Project/Library/metadata/5d/5d78db24d9b078249afe2028802e254b
	New Unity Project/Library/metadata/5e/5e3c1aec68812de45a3a58f7ba4a27cf
	New Unity Project/Library/metadata/68/68b603269ed52f64e8fce1d50e5e4bc0
	New Unity Project/Library/metadata/71/71608f79bcd39fc42ab9a201a1fc1734
	New Unity Project/Library/metadata/79/799c503cef66b0545817f2442b003a1c
	New Unity Project/Library/metadata/7b/7bc8d2cc0fc8530458584d93ae384a78
	New Unity Project/Library/metadata/81/817c6896250297a43ab42509a1acee77
	New Unity Project/Library/metadata/92/928075d0c855cdf42a2f9671da54ef16
	New Unity Project/Library/metadata/98/98c8d9abeecb4a943ae3ae62b40270c5
	New Unity Project/Library/metadata/a1/a14a9ed31960495419e19a6fe3593d70
	New Unity Project/Library/metadata/a7/a78ebb3368714114ca384ea1da4a4baa
	New Unity Project/Library/metadata/a8/a881fc777c7376c40b965d3521f7f705
	New Unity Project/Library/metadata/ab/ab3c44cb5c85dad448672f792da2666a
	New Unity Project/Library/metadata/b0/b0d0cf746db9f924fb845e9f1f6d566b
	New Unity Project/Library/metadata/ba/bac0ed41e8a882d48bc753a87319b23e
	New Unity Project/Library/metadata/c6/c68584eea0154da4996b6e3eea37df97
	New Unity Project/Library/metadata/c8/c8bfdb2574e5e584fbb603e37d558fa9
	New Unity Project/Library/metadata/f0/f024e04575287e445bf6a9511ffc35d6
	New Unity Project/New Unity Project-csharp.sln
	New Unity Project/New Unity Project.sln
	New Unity Project/New Unity Project.userprefs