Merge branch 'master' of asdf.us:megapixels_dev

7 files changed, 34 insertions, 0 deletions

diff --git a/site/content/pages/about/assets/LICENSE.md b/site/content/pages/about/assets/LICENSE.md
new file mode 100644
index 00000000..90f1fb01
--- /dev/null
+++ b/site/content/pages/about/assets/LICENSE.md
@@ -0,0 +1,34 @@
+ATTRIBUTION PROTOCOL
+
+If you use the MegaPixels data or any data derived from it, please cite the original work as follows:
+
+```
+@online{megapixels,
+  author = {Harvey, Adam. LaPlace, Jules.},
+  title = {MegaPixels: Origins, Ethics, and Privacy Implications of Publicly Available Face Recognition Image Datasets},
+  year = 2019,
+  url = {https://megapixels.cc/},
+  urldate = {2019-04-20}
+}
+```
+
+and include this license and attribution protocol within any derivative work.
+
+If you publish data derived from MegaPixels, the original dataset creators should first be notified.
+
+The MegaPixels dataset is made available under the Open Data Commons Attribution License (https://opendatacommons.org/licenses/by/1.0/) and for academic use only.
+
+READABLE SUMMARY OF Open Data Commons Attribution License 
+
+You are free:
+
+    To Share: To copy, distribute and use the dataset
+    To Create: To produce works from the dataset
+    To Adapt: To modify, transform and build upon the database
+
+As long as you:
+
+    Attribute: You must attribute any public use of the database, or works produced from the database, in the manner specified in the license. For any use or redistribution of the database, or works produced from it, you must make clear to others the license of the database and keep intact any notices on the original database.
+
+
+
diff --git a/site/content/pages/about/assets/adam-harvey-3d.jpg b/site/content/pages/about/assets/adam-harvey-3d.jpg
deleted file mode 100644
index 2d7cbd80..00000000
--- a/site/content/pages/about/assets/adam-harvey-3d.jpg
+++ /dev/null
diff --git a/site/content/pages/about/assets/adam-harvey-3d.png b/site/content/pages/about/assets/adam-harvey-3d.png
deleted file mode 100644
index 3616e851..00000000
--- a/site/content/pages/about/assets/adam-harvey-3d.png
+++ /dev/null
diff --git a/site/content/pages/about/assets/adam-harvey.jpg b/site/content/pages/about/assets/adam-harvey.jpg
deleted file mode 100644
index 38a484d1..00000000
--- a/site/content/pages/about/assets/adam-harvey.jpg
+++ /dev/null
diff --git a/site/content/pages/about/assets/jules-laplace-3d.jpg b/site/content/pages/about/assets/jules-laplace-3d.jpg
deleted file mode 100644
index d51e0933..00000000
--- a/site/content/pages/about/assets/jules-laplace-3d.jpg
+++ /dev/null
diff --git a/site/content/pages/about/assets/jules-laplace.jpg b/site/content/pages/about/assets/jules-laplace.jpg
deleted file mode 100644
index 18fc1170..00000000
--- a/site/content/pages/about/assets/jules-laplace.jpg
+++ /dev/null
diff --git a/site/content/pages/about/assets/mozilla.png b/site/content/pages/about/assets/mozilla.png
deleted file mode 100644
index 0fd4f115..00000000
--- a/site/content/pages/about/assets/mozilla.png
+++ /dev/null