commit
Merge origin/master
Tables added to database 
Database in the db folder within the project root