Delete .DS_Store
Merge with Emma
"Merge"
Merge branch 'Ingelhag' of https://github.com/EmmaEdv/funkypogys into Ingelhag