big change
modify gitignore
Merge remote-tracking branch 'upstream/master'
remove ds_stroe