Merge branch 'master' of github.com:adamhrv/megapixels_dev

9 files changed, 83 insertions, 9 deletions

diff --git a/site/content/pages/about/assets/adam-harvey.jpg b/site/content/pages/about/assets/adam-harvey.jpg
new file mode 100644
index 00000000..e0ab893a
--- /dev/null
+++ b/site/content/pages/about/assets/adam-harvey.jpg
diff --git a/site/content/pages/about/assets/jules-laplace.jpg b/site/content/pages/about/assets/jules-laplace.jpg
new file mode 100644
index 00000000..310b2783
--- /dev/null
+++ b/site/content/pages/about/assets/jules-laplace.jpg
diff --git a/site/content/pages/about/assets/mozilla.png b/site/content/pages/about/assets/mozilla.png
new file mode 100644
index 00000000..0fd4f115
--- /dev/null
+++ b/site/content/pages/about/assets/mozilla.png
diff --git a/site/content/pages/about/credits.md b/site/content/pages/about/credits.md
index 2d16155c..3cd0b05b 100644
--- a/site/content/pages/about/credits.md
+++ b/site/content/pages/about/credits.md
@@ -12,6 +12,17 @@ authors: Adam Harvey
  
 # Credits
 
+### Sidebar
+
+- [About](/about/)
+- [Press](/about/press/)
+- [Credits](/about/credits/)
+- [Disclaimer](/about/disclaimer/)
+- [Terms and Conditions](/about/terms/)
+- [Privacy Policy](/about/privacy/)
+
+## End Sidebar
+
 - MegaPixels by Adam Harvey
 - Made with support from Mozilla
 - Site developed by Jules Laplace
diff --git a/site/content/pages/about/disclaimer.md b/site/content/pages/about/disclaimer.md
index 64ce9f21..27cf6760 100644
--- a/site/content/pages/about/disclaimer.md
+++ b/site/content/pages/about/disclaimer.md
@@ -12,6 +12,17 @@ authors: Adam Harvey
 
 # Disclaimer
 
+### Sidebar
+
+- [About](/about/)
+- [Press](/about/press/)
+- [Credits](/about/credits/)
+- [Disclaimer](/about/disclaimer/)
+- [Terms and Conditions](/about/terms/)
+- [Privacy Policy](/about/privacy/)
+
+## End Sidebar
+
 Last updated: December 04, 2018
 
 The information contained on MegaPixels.cc website (the "Service") is for academic and artistic purposes only.
diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md
index e2025bf2..59f70d7a 100644
--- a/site/content/pages/about/index.md
+++ b/site/content/pages/about/index.md
@@ -1,8 +1,8 @@
 ------------
 
 status: published
-title: MegaPixels Credits
-desc: MegaPixels Project Team Credits
+title: About MegaPixels
+desc: About MegaPixels
 slug: credits
 published: 2018-12-04
 updated: 2018-12-04
@@ -10,10 +10,30 @@ authors: Adam Harvey
 
 ------------
 
-# Credits
+# About MegaPixels
 
-- MegaPixels by Adam Harvey
-- Made with support from Mozilla
-- Site developed by Jules Laplace
-- Design and graphics: Adam Harvey
-- Research assistants: Berit Gilma
\ No newline at end of file
+### Sidebar
+
+- [Press](/about/press/)
+- [Credits](/about/credits/)
+- [Disclaimer](/about/disclaimer/)
+- [Terms and Conditions](/about/terms/)
+- [Privacy Policy](/about/privacy/)
+
++ Years: 2002-2019
++ Datasets Analyzed: 325
++ Author: Adam Harvey
++ Development: Jules LaPlace
++ Research Assistance: Berit Gilma
+
+## End Sidebar
+
+MegaPixels aims to answer to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla.
+
+MegaPixels aims to answer to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla.
+
+![sideimage:Adam Harvey](assets/adam-harvey.jpg) **Adam Harvey** is an American artist and researcher based in Berlin. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for countersurveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups), the recipient of 2 PrototypeFund awards, and is currently a researcher in residence at Karlsruhe HfG studying artifical intelligence and datasets.
+
+![sideimage:Jules LaPlace](assets/jules-laplace.jpg) **Jules LaPlace** is an American artist and technologist also based in Berlin. He was previously the CTO of a NYC digital agency and currently works at VFRAME, developing computer vision for human rights groups, and building creative software for artists.
+
+![sideimage:Mozilla](assets/mozilla.png) **Mozilla** is a free software community founded in 1998 by members of Netscape. The Mozilla community uses, develops, spreads and supports Mozilla products, thereby promoting exclusively free software and open standards, with only minor exceptions. The community is supported institutionally by the not-for-profit Mozilla Foundation and its tax-paying subsidiary, the Mozilla Corporation.
diff --git a/site/content/pages/about/press.md b/site/content/pages/about/press.md
index 56b4990f..0e3124d0 100644
--- a/site/content/pages/about/press.md
+++ b/site/content/pages/about/press.md
@@ -13,8 +13,20 @@ authors: Adam Harvey
 
 # Press
 
+### Sidebar
+
+- [About](/about/)
+- [Press](/about/press/)
+- [Credits](/about/credits/)
+- [Disclaimer](/about/disclaimer/)
+- [Terms and Conditions](/about/terms/)
+- [Privacy Policy](/about/privacy/)
+
+## End Sidebar
+
 ![alt text](assets/test.jpg)
 
 - Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent <https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset>
 - Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent <https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset>
 - Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent <https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset>
+lfw
\ No newline at end of file
diff --git a/site/content/pages/about/privacy.md b/site/content/pages/about/privacy.md
index 17d1b707..9685a189 100644
--- a/site/content/pages/about/privacy.md
+++ b/site/content/pages/about/privacy.md
@@ -12,6 +12,16 @@ authors: Adam Harvey
 
 # Privacy Policy
 
+### Sidebar
+
+- [About](/about/)
+- [Press](/about/press/)
+- [Credits](/about/credits/)
+- [Disclaimer](/about/disclaimer/)
+- [Terms and Conditions](/about/terms/)
+- [Privacy Policy](/about/privacy/)
+
+## End Sidebar
 
 A summary of our privacy policy is as follows:
 
diff --git a/site/content/pages/about/terms.md b/site/content/pages/about/terms.md
index 3735ff08..6ad03bc1 100644
--- a/site/content/pages/about/terms.md
+++ b/site/content/pages/about/terms.md
@@ -11,8 +11,18 @@ authors: Adam Harvey
 ------------
  
 
-Terms and Conditions ("Terms")
+# Terms and Conditions ("Terms")
 
+### Sidebar
+
+- [About](/about/)
+- [Press](/about/press/)
+- [Credits](/about/credits/)
+- [Disclaimer](/about/disclaimer/)
+- [Terms and Conditions](/about/terms/)
+- [Privacy Policy](/about/privacy/)
+
+## End Sidebar
 
 Last updated: December 04, 2018