Add .json to .gitingore
Merge branch 'master' of https://github.com/DrJJ/watdo
solve conflict