Made changes to templates/views/models/urls
Merged conflicts and added gitignore file