before pull
added database back to gitignore
Merge branch 'master' of github.com:gburdge/catering-project