diff --git a/server/djangoapp/templates/djangoapp/about.html b/server/djangoapp/templates/djangoapp/about.html
new file mode 100644
index 0000000000..bb525d5275
--- /dev/null
+++ b/server/djangoapp/templates/djangoapp/about.html
@@ -0,0 +1,5 @@
+
+
+Welcome to Best Cars dealership, home to the best cars in North America. We sell domestic and imported cars at reasonable prices.
+
+
\ No newline at end of file
diff --git a/server/djangoapp/templates/djangoapp/index.html b/server/djangoapp/templates/djangoapp/index.html
index 1a9ee6e39a..591515d7b9 100644
--- a/server/djangoapp/templates/djangoapp/index.html
+++ b/server/djangoapp/templates/djangoapp/index.html
@@ -14,10 +14,44 @@
+<<<<<<< HEAD
+
+
+
+=======
This is the index page of your Django app!
+>>>>>>> 7673487c52ef44f161bbed07aa02bf1930211b6b
diff --git a/server/djangoapp/templates/djangoapp/registration.html b/server/djangoapp/templates/djangoapp/registration.html
index ae11ea4b71..40400fbbe7 100644
--- a/server/djangoapp/templates/djangoapp/registration.html
+++ b/server/djangoapp/templates/djangoapp/registration.html
@@ -6,6 +6,32 @@
+<<<<<<< HEAD
+
+=======
+>>>>>>> 7673487c52ef44f161bbed07aa02bf1930211b6b