Ignored the .DS_Store files
Fixed a conflict in the index.html