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

Assets/Prefab/City.prefab

Assets/Prefab/FoodResource.prefab

Assets/Prefab/StoneResource.prefab

Assets/Prefab/worker.prefab

Assets/Scripts/Collector.cs

Assets/Scripts/GroundGenerator/GroundGenerator.cs

Assets/Sprites/City.png

Assets/Sprites/City.png.meta

Assets/Sprites/Grass.png

Assets/Sprites/Grass.png.meta

Assets/Sprites/Tree.png

Assets/Sprites/Tree.png.meta

Assets/Sprites/villager.png.meta

Assets/Sprites/worker.png

Assets/Sprites/worker.png.meta

ProjectSettings/TagManager.asset