ignore ds_store
Merge remote-tracking branch 'origin/master'
fixes some stuff