Now initializes the DB
Merge origin/master