delete ds_store
for merge
Merge branch 'master' of https://github.com/JFantasy/ali
Merge branch 'master' of https://github.com/JFantasy/ali