add .DS_store to gitignore
change google search url
Merge branch 'master' into dev