my changes to index.htm
Adding DSStore to gitignore
Fixing merge
Deleting DSStores