From 392973c98e87b605d1fe144b6fb0c43bfde37f72 Mon Sep 17 00:00:00 2001
From: David Wehr <dawehr@iastate.edu>
Date: Fri, 25 Nov 2016 20:05:58 -0600
Subject: [PATCH] Revert "Prep for pelican branch merge"
This reverts commit 80c9d793f6318476d6192d9d35ddbcef0f233f2d.
---
{website_old => website}/.gitignore | 0
{website_old => website}/Gemfile | 0
{website_old => website}/LICENSE | 0
{website_old => website}/Makefile | 0
{website_old => website}/README.md | 0
{website_old => website}/_config.yml | 0
{website_old => website}/_includes/footer.html | 0
.../_includes/github-ribbon.html | 0
{website_old => website}/_includes/head.html | 0
{website_old => website}/_includes/icon-github.html | 0
.../_includes/icon-twitter.html | 0
{website_old => website}/_includes/navigation.html | 0
{website_old => website}/_layouts/default.html | 0
{website_old => website}/_layouts/post.html | 0
{website_old => website}/_sass/_highlight.scss | 0
{website_old => website}/_sass/_styles.scss | 0
{website_old => website}/controls.md | 0
{website_old => website}/css/main.scss | 0
{website_old => website}/deploy | 0
{website_old => website}/docs.md | 0
{website_old => website}/documents.md | 0
{website_old => website}/feed.xml | 0
.../files/DesignDocument1.docx.pdf | Bin
.../files/ProjectPlan1Template.docx.pdf | Bin
.../files/weeklyReports/.gitkeep | 0
.../weeklyReports/may1716_microCART_report1.pdf | Bin
.../weeklyReports/may1716_microCART_report10.pdf | Bin
.../weeklyReports/may1716_microCART_report2.pdf | Bin
.../weeklyReports/may1716_microCART_report3.pdf | Bin
.../weeklyReports/may1716_microCART_report4.pdf | Bin
.../weeklyReports/may1716_microCART_report5.pdf | Bin
.../weeklyReports/may1716_microCART_report6.pdf | Bin
.../weeklyReports/may1716_microCART_report7.pdf | Bin
.../weeklyReports/may1716_microCART_report8.pdf | Bin
.../weeklyReports/may1716_microCART_report9.pdf | Bin
{website_old => website}/ground.md | 0
{website_old => website}/images/dark.png | Bin
{website_old => website}/images/markdown.png | Bin
{website_old => website}/images/pid_diagram.png | Bin
{website_old => website}/images/quad_pic.jpg | Bin
{website_old => website}/images/standard.png | Bin
{website_old => website}/images/zyboBoard.png | Bin
{website_old => website}/images/zybo_pic.jpg | Bin
{website_old => website}/index.md | 0
{website_old => website}/members.md | 0
{website_old => website}/quad.md | 0
46 files changed, 0 insertions(+), 0 deletions(-)
rename {website_old => website}/.gitignore (100%)
rename {website_old => website}/Gemfile (100%)
rename {website_old => website}/LICENSE (100%)
rename {website_old => website}/Makefile (100%)
rename {website_old => website}/README.md (100%)
rename {website_old => website}/_config.yml (100%)
rename {website_old => website}/_includes/footer.html (100%)
rename {website_old => website}/_includes/github-ribbon.html (100%)
rename {website_old => website}/_includes/head.html (100%)
rename {website_old => website}/_includes/icon-github.html (100%)
rename {website_old => website}/_includes/icon-twitter.html (100%)
rename {website_old => website}/_includes/navigation.html (100%)
rename {website_old => website}/_layouts/default.html (100%)
rename {website_old => website}/_layouts/post.html (100%)
rename {website_old => website}/_sass/_highlight.scss (100%)
rename {website_old => website}/_sass/_styles.scss (100%)
rename {website_old => website}/controls.md (100%)
rename {website_old => website}/css/main.scss (100%)
rename {website_old => website}/deploy (100%)
rename {website_old => website}/docs.md (100%)
rename {website_old => website}/documents.md (100%)
rename {website_old => website}/feed.xml (100%)
rename {website_old => website}/files/DesignDocument1.docx.pdf (100%)
rename {website_old => website}/files/ProjectPlan1Template.docx.pdf (100%)
rename {website_old => website}/files/weeklyReports/.gitkeep (100%)
rename {website_old => website}/files/weeklyReports/may1716_microCART_report1.pdf (100%)
rename {website_old => website}/files/weeklyReports/may1716_microCART_report10.pdf (100%)
rename {website_old => website}/files/weeklyReports/may1716_microCART_report2.pdf (100%)
rename {website_old => website}/files/weeklyReports/may1716_microCART_report3.pdf (100%)
rename {website_old => website}/files/weeklyReports/may1716_microCART_report4.pdf (100%)
rename {website_old => website}/files/weeklyReports/may1716_microCART_report5.pdf (100%)
rename {website_old => website}/files/weeklyReports/may1716_microCART_report6.pdf (100%)
rename {website_old => website}/files/weeklyReports/may1716_microCART_report7.pdf (100%)
rename {website_old => website}/files/weeklyReports/may1716_microCART_report8.pdf (100%)
rename {website_old => website}/files/weeklyReports/may1716_microCART_report9.pdf (100%)
rename {website_old => website}/ground.md (100%)
rename {website_old => website}/images/dark.png (100%)
rename {website_old => website}/images/markdown.png (100%)
rename {website_old => website}/images/pid_diagram.png (100%)
rename {website_old => website}/images/quad_pic.jpg (100%)
rename {website_old => website}/images/standard.png (100%)
rename {website_old => website}/images/zyboBoard.png (100%)
rename {website_old => website}/images/zybo_pic.jpg (100%)
rename {website_old => website}/index.md (100%)
rename {website_old => website}/members.md (100%)
rename {website_old => website}/quad.md (100%)
diff --git a/website_old/.gitignore b/website/.gitignore
similarity index 100%
rename from website_old/.gitignore
rename to website/.gitignore
diff --git a/website_old/Gemfile b/website/Gemfile
similarity index 100%
rename from website_old/Gemfile
rename to website/Gemfile
diff --git a/website_old/LICENSE b/website/LICENSE
similarity index 100%
rename from website_old/LICENSE
rename to website/LICENSE
diff --git a/website_old/Makefile b/website/Makefile
similarity index 100%
rename from website_old/Makefile
rename to website/Makefile
diff --git a/website_old/README.md b/website/README.md
similarity index 100%
rename from website_old/README.md
rename to website/README.md
diff --git a/website_old/_config.yml b/website/_config.yml
similarity index 100%
rename from website_old/_config.yml
rename to website/_config.yml
diff --git a/website_old/_includes/footer.html b/website/_includes/footer.html
similarity index 100%
rename from website_old/_includes/footer.html
rename to website/_includes/footer.html
diff --git a/website_old/_includes/github-ribbon.html b/website/_includes/github-ribbon.html
similarity index 100%
rename from website_old/_includes/github-ribbon.html
rename to website/_includes/github-ribbon.html
diff --git a/website_old/_includes/head.html b/website/_includes/head.html
similarity index 100%
rename from website_old/_includes/head.html
rename to website/_includes/head.html
diff --git a/website_old/_includes/icon-github.html b/website/_includes/icon-github.html
similarity index 100%
rename from website_old/_includes/icon-github.html
rename to website/_includes/icon-github.html
diff --git a/website_old/_includes/icon-twitter.html b/website/_includes/icon-twitter.html
similarity index 100%
rename from website_old/_includes/icon-twitter.html
rename to website/_includes/icon-twitter.html
diff --git a/website_old/_includes/navigation.html b/website/_includes/navigation.html
similarity index 100%
rename from website_old/_includes/navigation.html
rename to website/_includes/navigation.html
diff --git a/website_old/_layouts/default.html b/website/_layouts/default.html
similarity index 100%
rename from website_old/_layouts/default.html
rename to website/_layouts/default.html
diff --git a/website_old/_layouts/post.html b/website/_layouts/post.html
similarity index 100%
rename from website_old/_layouts/post.html
rename to website/_layouts/post.html
diff --git a/website_old/_sass/_highlight.scss b/website/_sass/_highlight.scss
similarity index 100%
rename from website_old/_sass/_highlight.scss
rename to website/_sass/_highlight.scss
diff --git a/website_old/_sass/_styles.scss b/website/_sass/_styles.scss
similarity index 100%
rename from website_old/_sass/_styles.scss
rename to website/_sass/_styles.scss
diff --git a/website_old/controls.md b/website/controls.md
similarity index 100%
rename from website_old/controls.md
rename to website/controls.md
diff --git a/website_old/css/main.scss b/website/css/main.scss
similarity index 100%
rename from website_old/css/main.scss
rename to website/css/main.scss
diff --git a/website_old/deploy b/website/deploy
similarity index 100%
rename from website_old/deploy
rename to website/deploy
diff --git a/website_old/docs.md b/website/docs.md
similarity index 100%
rename from website_old/docs.md
rename to website/docs.md
diff --git a/website_old/documents.md b/website/documents.md
similarity index 100%
rename from website_old/documents.md
rename to website/documents.md
diff --git a/website_old/feed.xml b/website/feed.xml
similarity index 100%
rename from website_old/feed.xml
rename to website/feed.xml
diff --git a/website_old/files/DesignDocument1.docx.pdf b/website/files/DesignDocument1.docx.pdf
similarity index 100%
rename from website_old/files/DesignDocument1.docx.pdf
rename to website/files/DesignDocument1.docx.pdf
diff --git a/website_old/files/ProjectPlan1Template.docx.pdf b/website/files/ProjectPlan1Template.docx.pdf
similarity index 100%
rename from website_old/files/ProjectPlan1Template.docx.pdf
rename to website/files/ProjectPlan1Template.docx.pdf
diff --git a/website_old/files/weeklyReports/.gitkeep b/website/files/weeklyReports/.gitkeep
similarity index 100%
rename from website_old/files/weeklyReports/.gitkeep
rename to website/files/weeklyReports/.gitkeep
diff --git a/website_old/files/weeklyReports/may1716_microCART_report1.pdf b/website/files/weeklyReports/may1716_microCART_report1.pdf
similarity index 100%
rename from website_old/files/weeklyReports/may1716_microCART_report1.pdf
rename to website/files/weeklyReports/may1716_microCART_report1.pdf
diff --git a/website_old/files/weeklyReports/may1716_microCART_report10.pdf b/website/files/weeklyReports/may1716_microCART_report10.pdf
similarity index 100%
rename from website_old/files/weeklyReports/may1716_microCART_report10.pdf
rename to website/files/weeklyReports/may1716_microCART_report10.pdf
diff --git a/website_old/files/weeklyReports/may1716_microCART_report2.pdf b/website/files/weeklyReports/may1716_microCART_report2.pdf
similarity index 100%
rename from website_old/files/weeklyReports/may1716_microCART_report2.pdf
rename to website/files/weeklyReports/may1716_microCART_report2.pdf
diff --git a/website_old/files/weeklyReports/may1716_microCART_report3.pdf b/website/files/weeklyReports/may1716_microCART_report3.pdf
similarity index 100%
rename from website_old/files/weeklyReports/may1716_microCART_report3.pdf
rename to website/files/weeklyReports/may1716_microCART_report3.pdf
diff --git a/website_old/files/weeklyReports/may1716_microCART_report4.pdf b/website/files/weeklyReports/may1716_microCART_report4.pdf
similarity index 100%
rename from website_old/files/weeklyReports/may1716_microCART_report4.pdf
rename to website/files/weeklyReports/may1716_microCART_report4.pdf
diff --git a/website_old/files/weeklyReports/may1716_microCART_report5.pdf b/website/files/weeklyReports/may1716_microCART_report5.pdf
similarity index 100%
rename from website_old/files/weeklyReports/may1716_microCART_report5.pdf
rename to website/files/weeklyReports/may1716_microCART_report5.pdf
diff --git a/website_old/files/weeklyReports/may1716_microCART_report6.pdf b/website/files/weeklyReports/may1716_microCART_report6.pdf
similarity index 100%
rename from website_old/files/weeklyReports/may1716_microCART_report6.pdf
rename to website/files/weeklyReports/may1716_microCART_report6.pdf
diff --git a/website_old/files/weeklyReports/may1716_microCART_report7.pdf b/website/files/weeklyReports/may1716_microCART_report7.pdf
similarity index 100%
rename from website_old/files/weeklyReports/may1716_microCART_report7.pdf
rename to website/files/weeklyReports/may1716_microCART_report7.pdf
diff --git a/website_old/files/weeklyReports/may1716_microCART_report8.pdf b/website/files/weeklyReports/may1716_microCART_report8.pdf
similarity index 100%
rename from website_old/files/weeklyReports/may1716_microCART_report8.pdf
rename to website/files/weeklyReports/may1716_microCART_report8.pdf
diff --git a/website_old/files/weeklyReports/may1716_microCART_report9.pdf b/website/files/weeklyReports/may1716_microCART_report9.pdf
similarity index 100%
rename from website_old/files/weeklyReports/may1716_microCART_report9.pdf
rename to website/files/weeklyReports/may1716_microCART_report9.pdf
diff --git a/website_old/ground.md b/website/ground.md
similarity index 100%
rename from website_old/ground.md
rename to website/ground.md
diff --git a/website_old/images/dark.png b/website/images/dark.png
similarity index 100%
rename from website_old/images/dark.png
rename to website/images/dark.png
diff --git a/website_old/images/markdown.png b/website/images/markdown.png
similarity index 100%
rename from website_old/images/markdown.png
rename to website/images/markdown.png
diff --git a/website_old/images/pid_diagram.png b/website/images/pid_diagram.png
similarity index 100%
rename from website_old/images/pid_diagram.png
rename to website/images/pid_diagram.png
diff --git a/website_old/images/quad_pic.jpg b/website/images/quad_pic.jpg
similarity index 100%
rename from website_old/images/quad_pic.jpg
rename to website/images/quad_pic.jpg
diff --git a/website_old/images/standard.png b/website/images/standard.png
similarity index 100%
rename from website_old/images/standard.png
rename to website/images/standard.png
diff --git a/website_old/images/zyboBoard.png b/website/images/zyboBoard.png
similarity index 100%
rename from website_old/images/zyboBoard.png
rename to website/images/zyboBoard.png
diff --git a/website_old/images/zybo_pic.jpg b/website/images/zybo_pic.jpg
similarity index 100%
rename from website_old/images/zybo_pic.jpg
rename to website/images/zybo_pic.jpg
diff --git a/website_old/index.md b/website/index.md
similarity index 100%
rename from website_old/index.md
rename to website/index.md
diff --git a/website_old/members.md b/website/members.md
similarity index 100%
rename from website_old/members.md
rename to website/members.md
diff --git a/website_old/quad.md b/website/quad.md
similarity index 100%
rename from website_old/quad.md
rename to website/quad.md
--
GitLab