ignoring DS_Store noise
Merge branch 'master' of hax:haxxxx/JPS