ignore ds_store files
Merge branch 'master' of github.com:remotezygote/CityWatch