Merge branch 'master' of ghghgh.us:armory-fmf-cms

4 files changed, 1 insertions, 0 deletions

diff --git a/index.js b/index.js
index ff727f2..db2fcb6 100644
--- a/index.js
+++ b/index.js
@@ -39,6 +39,7 @@ var app = okcms.createApp({
       medium: {type: 'string'},
       category: {type: 'string'},
       keywords: {type: 'text'},
+			shortDescription: {type: 'string'},
       description: {type: 'text'},
       image: {type: 'image'},
       credit: {type: 'text'},
diff --git a/public/assets/img/armory.png b/public/assets/img/armory.png
new file mode 100644
index 0000000..bf881a0
--- /dev/null
+++ b/public/assets/img/armory.png
diff --git a/public/assets/img/aww.png b/public/assets/img/aww.png
new file mode 100644
index 0000000..d24bb47
--- /dev/null
+++ b/public/assets/img/aww.png
diff --git a/public/assets/img/logo.png b/public/assets/img/logo.png
new file mode 100644
index 0000000..14a9922
--- /dev/null
+++ b/public/assets/img/logo.png