diff --git a/.gitignore b/.gitignore
index c96a4cd4..5a1ff56d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,9 @@
TODO
*.zip
test.html
-*.log
\ No newline at end of file
+*.log
+
+# Intellij IDEA Project Files
+*.iml
+*.ipr
+*.iws
diff --git a/README.md b/README.md
index 7f782af9..19a091ea 100644
--- a/README.md
+++ b/README.md
@@ -19,3 +19,16 @@ A basic read-only API can be accessed at `/admin/api.php`. It returns the follow
"ads_percentage_today": 80.892423238348
}
```
+
+## Contributing
+If you would like to add to the project, please make sure to follow these guidelines:
+
+1. Branch off of ```devel``` into your own feature branch (ex. ```feature```).
+2. When you are finished, make a pull request to merge your ```feature``` branch into ```devel```.
+
+Keep these things in mind:
+
+* Use 4 spaces instead of tabs
+* Commit Unix line endings
+* If you want, try to keep to the theme of black holes/gravity. This can add some fun to your submission.
+
diff --git a/api.php b/api.php
index b142b672..c9e77cb8 100644
--- a/api.php
+++ b/api.php
@@ -1,6 +1,11 @@
+<<<<<<< HEAD
>>>>>> 4b0e1d9ca21302104fe9bca06d9b21a20f938caf
?>
diff --git a/footer.html b/footer.html
new file mode 100644
index 00000000..8772fa9b
--- /dev/null
+++ b/footer.html
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+