ignore .db-journal files
merge
Merge branch 'master' of github.com:sprestwood/3240teamtestrepo