new presets
resolved conflict
Merge branch 'master' of github.com:m0g/dotfiles
added playlists & rawtherapee presets
Merge branch 'master' of github.com:m0g/dotfiles