Resolve conflict

.coverage

app/migrations/0001_initial.py

app/migrations/0002_auto_20200408_2115.py

app/migrations/0003_auto_20200418_1452.py

app/migrations/0004_auto_20200421_1557.py

app/migrations/0005_auto_20200421_1625.py

app/migrations/0006_auto_20200421_1633.py

app/migrations/0007_auto_20200421_2151.py

app/migrations/0008_auto_20200422_2202.py

app/migrations/0009_auto_20200422_2206.py

app/migrations/0010_auto_20200422_2206.py

app/models.py

authentication/templates/login.html

authentication/templates/login_admin.html

authentication/tests.py

authentication/urls.py

authentication/views.py

register/templates/index.html

requirements.txt

sonar-project.properties