conf
dos2unix
Merge branch 'master' of github.com:mydmdm/conf