Fixing floating
Merge branch 'master' into jamiltron

* master:
  Organizing lakes
  Floating updates
  flower and full bread thingy
Fixing?
dialog stuffs
Merge commit '9ede274963af027cb8b25071233202b675710f55'

Conflicts:
	Assets/SpriteCollections/DuckCharacter Data/DuckCharacter.prefab
fixed merge