ignore ds_store
Modified Global Navi
Merge branch 'master' of https://github.com/monaca/website