diff --git a/index.html b/index.html index 1de3dda..4768b60 100644 --- a/index.html +++ b/index.html @@ -22,7 +22,12 @@
+<<<<<<< HEAD + + +======= +>>>>>>> 94ce8e40fcf5a7e3adf7b66922b518b8b11a4335 \ No newline at end of file