Ignore .DS_store
Ignore .DS_store
Merge branch 'master' of github.com:Floobits/flootty