.DS_Store banished!
in progress, poll slides
merge conflict
poll slides are appearing!
merge conflict
removed ds_store
merge conflict