Sad line endings screw up again.
Merge branch 'master' of https://github.com/ycastonguay/MPfm