Metadaten und Fruitpickup

Metadaten und Fruitpickup
Merge branch 'master' of https://github.com/ChrAfonso/jamgame

Conflicts:
	src/Assets/Audio/fanfare.mp3.meta
	src/Assets/Audio/fx.meta
	src/Assets/Audio/fx/fx_die.mp3.meta
	src/Assets/Audio/fx/fx_fruit_appear.mp3.meta
	src/Assets/Audio/fx/fx_fruit_eat.mp3.meta
	src/Assets/Audio/fx/fx_marmelade_gulp_loop.mp3.meta
	src/Assets/Audio/fx/fx_run_loop.mp3.meta
	src/Assets/Audio/fx/fx_slide_loop.mp3.meta
	src/Assets/scripts/game/player/PlayerController.cs
Merge branch 'master' of https://github.com/ChrAfonso/jamgame