Animations
Merge remote-tracking branch 'origin/master'

Conflicts:
	GBJAM/Assets/Scenes/Level1.unity
	GBJAM/Assets/Sound/Interactive/pickup-1.wav.meta
Merge remote-tracking branch 'origin/master'

Conflicts:
	GBJAM/Assets/Animations/Animations/Player.meta
	GBJAM/Assets/Scenes/Level1.unity
	GBJAM/Assets/Sound/Interactive/pickup-1.wav.meta