Created relevant models
Fixed .gitignore conflict