Unity räjähti, korjaus
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	UnityProject/Assets/_Scenes/asko_level.unity
fixing boss
Merge remote-tracking branch 'origin/master'