Merge branch 'master' of https://github.com/cattleguard/watchfactory
Added file to .gitignore