removed DS_Store
Merge branch 'master' of github.com:Romdeau/enerleave
fix up error with DS_Store conflict