db seeder
added composer lock
merged conflict gitignore