rm for ds store
Merge branch 'master' of https://github.com/sebs/medproto
Merge branch 'master' of https://github.com/sebs/medproto