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?
Merge branch 'master' of https://github.com/SaFrMo/wizard
Merge branch 'master' of https://github.com/SaFrMo/wizard
Wizard update collision, add wind animation
Added FlameTorch and pipes
Merge remote-tracking branch 'origin/Brook2' into Taylor2

Conflicts:
	packages/wizard/wizard.controller
	prefabs/Wizard.prefab
	scenes/TutorialMtMoverEdited.unity