gitignore
no message
Merge branch 'master' of https://github.com/Katrin11/JacobsHackWaterrider

Conflicts:
	Assets/PlayerMovement.cs
	Assets/PlayerMovement.cs.meta
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/1a/1a1fcaddeb13ac34b9efb078199c6f83
	Library/metadata/21/213a945f6a78d164988b84619820c6cf
	Library/metadata/43/43e16538278499b4382f182ac0221706
	Library/metadata/4c/4c1ae5a0308aeb841b6977206baac975
	Library/metadata/58/589a5eb754fe11f41ae1da5d7f95aaac
	Library/metadata/86/86158435468ba59449f0926077d64e0c
	Library/metadata/9a/9a68b6d29dc0d664f816394f06a0976e
	Library/metadata/bc/bc693fbcdd6f4a946b4bf67b87d8dafc
	Library/metadata/c2/c275c021e671ddf4a8a648898903901a
	Library/metadata/de/de370789eea37cd4f9aeb45da9d22eb3
	Library/metadata/ea/eabc2b3d7e3126244bfe03d5d7a19422
	Library/metadata/f3/f392904114ff995419534ce1e2fb4534
	Library/metadata/f5/f559e5c9592dee84385d8920f336ea09