remote DS_Store
misc
Merge branch 'master' of https://github.com/idevstuffs/ci-starter