DS_Store
Merge branch 'gh-pages'
Updated copy