dialog stuffs
Merge commit '9ede274963af027cb8b25071233202b675710f55'

Conflicts:
	Assets/SpriteCollections/DuckCharacter Data/DuckCharacter.prefab
fixed merge
dialog and conv0
all kinds of sexyness
Merge commit '2cea411f5e025b354c6e5f298eee0f434b5e738a'
Git add all don't blame me for nothin