ProjectSettings?
Merge remote-tracking branch 'origin/sanders-work' into Taylor2

Conflicts:
	scenes/TutorialMtMoverEdited.unity
finished mtmover tutoriall
Merge remote-tracking branch 'origin/sanders-work' into Taylor2

Conflicts:
	scenes/TutorialMtMoverEdited.unity
add water tutorial
Edited crate prefab, water tutorial
Merge remote-tracking branch 'origin/sanders-work' into Taylor2
Water Tutorial
Return Toturial.
Merge remote-tracking branch 'origin/sanders-work' into Taylor2

Conflicts:
	prefabs/Map Elements/Crate.prefab
Merge commit '7d8fbb60f644f87121ad0ab205244071f86ffc2f'

Conflicts:
	prefabs/Map Elements/Ground.prefab
	scenes/dev/dev_piranhaScene.unity
I have no idea what I'm doing!

Merge remote-tracking branch 'origin/Taylor2'

Conflicts:
	prefabs/Map Elements/Ground.prefab
	scenes/TutorialMtMoverEdited.unity.meta
up to date
Merge branch 'master' of https://github.com/SaFrMo/wizard

# By Sander
# Via Brook Andrews (2) and Sander (1)
* 'master' of https://github.com/SaFrMo/wizard:
  ProjectSettings?
reset pixel to unit ratio back to 598 CUZ THATS WHAT IT SHOULD BE!
Added sky Prefab(under entourage) Sprite can be changed to 6 different sky gradients.
Merge branch 'master' of https://github.com/SaFrMo/wizard
Merge remote-tracking branch 'origin/sanders-work' into Taylor2

Conflicts:
	scenes/TutorialMtMoverEdited.unity
no message
re-added sky