remove .DS_Store
removing .DS_Store again
Merge branch 'master' of https://github.com/vcavallo/playlister-rb-unit-1
Merge branch 'master' of https://github.com/vcavallo/playlister-rb-unit-1
Merge branch 'master' of https://github.com/vcavallo/playlister-rb-unit-1 into fix-index-page
changes to the index page