Added fiwaredb to gitignore
Fixed conflicts