no message
no message
Merge branch 'master' of https://github.com/Methestel/Unity-project-repository

Conflicts:
	MagicFinger/Assets/Resources/Prefabs/2Kuoppaa4platformia.prefab
	MagicFinger/Assets/Resources/Prefabs/Laakso2platformia.prefab
	MagicFinger/Assets/Resources/Prefabs/kuoppa 1.prefab
	MagicFinger/Assets/Resources/Prefabs/tasaiinen8.prefab
no message
Merge branch 'master' of https://github.com/Methestel/Unity-project-repository

Conflicts:
	MagicFinger/Assets/Resources/Prefabs/2Kuoppaa4platformia.prefab
	MagicFinger/Assets/Resources/Prefabs/Laakso2platformia.prefab
	MagicFinger/Assets/Resources/Prefabs/kuoppa 1.prefab
	MagicFinger/Assets/Resources/Prefabs/tasaiinen8.prefab