Merge pull request #3 from tballenger/importing

Importing
Blocking ds_store .gitignore
I hate .ds_store
Merge branch 'master' into importing