Merge branch 'master' of https://gitlab.utu.fi/eolokk/game_jam19

Assets/Audio/kivikausi_bushEffect.it

Assets/Audio/kivikausi_bushEffect.it.meta

Assets/Audio/kivikausi_stoneEffect.it

Assets/Audio/kivikausi_stoneEffect.it.meta

Assets/Audio/kivikausi_woodeffect.it

Assets/Audio/kivikausi_woodeffect.it.meta

Assets/Audio/lautanen.it

Assets/Audio/lautanen.it.meta

Assets/Prefab/Flag.prefab

Assets/Prefab/Flag.prefab.meta

Assets/Prefab/FoodResource.prefab

Assets/Prefab/WoodResource.prefab

Assets/Prefab/worker.prefab

Assets/Scenes/MainScene.unity

Assets/Scripts/AudioSystem.cs

Assets/Scripts/Collector.cs

Assets/Scripts/EventSystem/EventType.cs

Assets/Scripts/Flag.cs

Assets/Scripts/Flag.cs.meta

Assets/Scripts/Resources/BerryBush.cs