diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6caf68a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +output \ No newline at end of file diff --git a/output/index.html b/output/index.html index 8c9532f..bacf8a1 100755 --- a/output/index.html +++ b/output/index.html @@ -4,6 +4,7 @@ +<<<<<<< HEAD
@@ -25,4 +26,38 @@ - \ No newline at end of file +