Move .DS_Store up
Merge branch 'master' of github.com:betterplace/team_dashboard