initial
fixed ignore
fixing merge issues
updated ignores
Merge branch 'master' of https://github.com/TeamPalmTree/cloudcast-liquidsoap
updated ignores
Merge branch 'master' of https://github.com/TeamPalmTree/cloudcast-liquidsoap