git ignored desktop.ini
Merge branch 'master' of github.com:dished/dished