Ignore DS_Store
Merge branch 'master' of https://github.com/rempelj/BARBERSHOP