Zmeneny playlist??? nemalo to byt v ignore?
Zase zmeneny playlist
Merge branch 'master' of github.com:r3dr1f/Online-Radio

Conflicts:
	liquidsoap/playlist.m3u
Pridany gitignore na playlist.m3u