fixing db
Merge branch 'master' of github.com:franciuipapi/Project2