diff --git a/.gitignore b/.gitignore
index ab695b6..b218e08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,10 @@ Vagrantfile
.coverage*
/.cache
+<<<<<<< HEAD
.pytest_cache/
+=======
+Gemfile
+Gemfile.lock
+_site/
+>>>>>>> 600be0a... Added anchor.js to docs
diff --git a/docs/_includes/ga_tracking.html b/docs/_includes/ga_tracking.html
index b260b88..f0c8fb5 100644
--- a/docs/_includes/ga_tracking.html
+++ b/docs/_includes/ga_tracking.html
@@ -11,3 +11,10 @@
})();
+
+
+