stuff
added .DS_Store to gitignore
merged in gh-pages