working

6 files changed, 71 insertions, 4 deletions

diff --git a/site/content/pages/datasets/brainwash/index.md b/site/content/pages/datasets/brainwash/index.md
index 4e73aef3..e04251d3 100644
--- a/site/content/pages/datasets/brainwash/index.md
+++ b/site/content/pages/datasets/brainwash/index.md
@@ -2,10 +2,11 @@
 
 status: published
 title: Brainwash
-desc: <span style="color:#ffaa00">Brainwash</span> is a dataset of people from webcams the Brainwash Cafe in San Francisco being used to train face detection algorithms
+desc: Brainwash is a dataset of people from webcams the Brainwash Cafe in San Francisco being used to train face detection algorithms
 subdesc: Brainwash dataset includes 11,918 images of "everyday life of a busy downtown cafe"
 slug: brainwash
 cssclass: dataset
+color: #ffaa00
 image: assets/background.jpg
 year: 2015
 published: 2019-2-23
@@ -34,7 +35,7 @@ authors: Adam Harvey
 
 *Brainwash* is a face detection dataset created from the Brainwash Cafe's livecam footage including 11,918 images of "everyday life of a busy downtown cafe[^readme]". The images are used to develop face detection algorithms for the "challenging task of detecting people in crowded scenes" and tracking them.
 
-Before closing in 2017, Brainwash Cafe was a "cafe and laundromat" located in San Francisco's Lower Haight district. The cafe published a publicy available livestream from the cafe with a view of the cash register, performance stage, and seating area.
+Before closing in 2017, Brainwash Cafe was a "cafe and laundromat" located in San Francisco's SoMA district. The cafe published a publicy available livestream from the cafe with a view of the cash register, performance stage, and seating area.
 
 Since it's publication by Stanford in 2015, the Brainwash dataset has appeared in several notable research papers. In September 2016 four researchers from the National University of Defense Technology in Changsha, China used the Brainwash dataset for a research study on "people head detection in crowded scenes", concluding that their algorithm "achieves superior head detection performance on the crowded scenes dataset[^localized_region_context]". And again in 2017 three researchers at the National University of Defense Technology used Brainwash for a study on object detection noting "the data set used in our experiment is shown in Table 1, which includes one scene of the brainwash dataset[^replacement_algorithm]".
 
diff --git a/site/content/pages/datasets/index.md b/site/content/pages/datasets/index.md
index 30fca496..13e45b49 100644
--- a/site/content/pages/datasets/index.md
+++ b/site/content/pages/datasets/index.md
@@ -13,4 +13,4 @@ sync: false
 
 # Facial Recognition Datasets
 
-[add text, make sortable] This is a list of all the facial recognition datasets
\ No newline at end of file
+### Case Studies
diff --git a/site/content/pages/datasets/kitti/index.md b/site/content/pages/datasets/kitti/index.md
new file mode 100644
index 00000000..25d0da69
--- /dev/null
+++ b/site/content/pages/datasets/kitti/index.md
@@ -0,0 +1,42 @@
+------------
+
+status: published
+title: KITTI
+desc: <span style="color:#ffaa00">Kitti</span> TBD
+subdesc: TBD
+slug: kitti
+cssclass: dataset
+image: assets/background.jpg
+year: 2015
+published: 2019-2-23
+updated: 2019-2-23
+authors: Adam Harvey
+
+------------
+
+### sidebar
+
++ Collected: TBD
+
+## Kitti
+
+add text
+
+{% include 'map.html' %}
+
+
+{% include 'supplementary_header.html' %}
+
+{% include 'citations.html' %}
+
+
+### Additional Information
+
+- The dataset author spoke about his research at the CVPR conference in 2016 <https://www.youtube.com/watch?v=Nl2fBKxwusQ>
+
+
+### Footnotes
+
+[^readme]: "readme.txt" https://exhibits.stanford.edu/data/catalog/sx925dc9385.
+[^localized_region_context]: Li, Y. and Dou, Y. and Liu, X. and Li, T. Localized Region Context and Object Feature Fusion for People Head Detection. ICIP16 Proceedings. 2016. Pages 594-598.
+[^replacement_algorithm]: Zhao. X, Wang Y, Dou, Y. A Replacement Algorithm of Non-Maximum Suppression Base on Graph Clustering. 
\ No newline at end of file
diff --git a/site/content/pages/datasets/lfw/index.md b/site/content/pages/datasets/lfw/index.md
index da7c514a..d7132f97 100644
--- a/site/content/pages/datasets/lfw/index.md
+++ b/site/content/pages/datasets/lfw/index.md
@@ -2,11 +2,15 @@
 
 status: published
 title: Labeled Faces in The Wild
-desc: <span style="color:#ff0000">Labeled Faces in The Wild (LFW)</span> is a database of face photographs designed for studying the problem of unconstrained face recognition.
+desc: Labeled Faces in The Wild (LFW) is a database of face photographs designed for studying the problem of unconstrained face recognition.
 subdesc: It includes 13,456 images of 4,432 people's images copied from the Internet during 2002-2004.
 image: assets/background.jpg
 slug: lfw
+<<<<<<< HEAD
 year: 2007
+=======
+color: #ff0000
+>>>>>>> e6c50e5550275b8e9d2245201c77c6f9fef7a11a
 published: 2019-2-23
 updated: 2019-2-23
 authors: Adam Harvey
diff --git a/site/content/pages/test/chart.md b/site/content/pages/test/chart.md
new file mode 100644
index 00000000..e29410a7
--- /dev/null
+++ b/site/content/pages/test/chart.md
@@ -0,0 +1,19 @@
+------------
+
+status: published
+title: Chart
+desc: Chart Test
+slug: chart-test
+published: 2018-12-04
+updated: 2018-12-04
+authors: Megapixels
+ 
+------------
+
+# Chart
+
+### [&larr; Back to test index](/test/)
+
+```
+chart lfw
+```
diff --git a/site/content/pages/test/index.md b/site/content/pages/test/index.md
index 01a00d34..7d77c3d4 100644
--- a/site/content/pages/test/index.md
+++ b/site/content/pages/test/index.md
@@ -19,4 +19,5 @@ authors: Megapixels
 - [Citation map](/test/map/index.html)
 - [Face search](/test/face_search/index.html)
 - [Name search](/test/name_search/index.html)
+- [Chart](/test/chart/index.html)
 - [Modal image gallery](/test/gallery/index.html)