merge files -> .gitignore
Merge branch 'master' of github.com:ebagdemir/watchdog
orig merge files are removed