merge2

_config.yml

@@ -1,5 +1,5 @@
-title:            Site Title
-description:      Site description for the metas.
+title:            Imperial Robotics
+description:      Dallas, TX FTC team 3734
 logo:             omikron.png
 disqus_shortname: shortname
 # Assign a default image for your site's header and footer
@@ -14,7 +14,7 @@ animated_fins:    true
 # Specify the fin color in RGB value
 fin_color:        "255,255,255"
 # Change url to your domain. Leave localhost server or blank when working locally.
-url:          http://hmfaysal.me/hmfaysal-omega-theme
+url:          http://imperialrobotics.github.io
 # baseurl:           
 
 # Gems used
@@ -42,20 +42,15 @@ jekyll-archives:
 
 # Owner/author information
 author:
-  name:           Your Name
+  name:           Imperial Robotics
   picture:        your-photo.jpg
-  email:          your@email.com
+  email:          semimperialrobotics@gmail.com
   # Use the coder's toolbox at http://coderstoolbox.net/string/#!encoding=xml&action=encode&charset=us_ascii to encode your description into XML string
-  description:    Some Details about yourself
+  description:    We FTC team 3734 called Imperial Robotics located at the School of Science and Engineering in Dallas, TX. Our mission is to spread robotics in the world so that people learn how fun and engaging the robotics competitions of FIRST are. This year, we hope to participate in several communtiy service projects and build a robot using the help of the community. We want to bring everyone together to create something that is truely revolutional.
   # Social networking links used in footer. Update and remove as you like.
-  twitter:
-  facebook:
-  github:
-  linkedin:
-  instagram:
-  tumblr:
-  # For Google Authorship https://plus.google.com/authorship
-  google_plus:    "http://plus.google.com/123123123123132123"
+  twitter: imperialrob3734
+  instagram: imperialrob3734
+
 
 # Analytics and webmaster tools stuff goes here
 google_analytics:
@@ -70,8 +65,8 @@ links:
     icon: home
   - title: Categories
     url: /categories
-  - title: Tags
-    url: /tags
+  - title: About
+    url: /about
 
 # Sitemap configuration
 # https://github.com/kinnetica/jekyll-plugins
@@ -85,7 +80,7 @@ sitemap:
         - "/index.html"
 
 # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-timezone:    America/New_York
+timezone:    America/Chicago
 future:      true
 markdown:    kramdown
 highlighter: rouge
@@ -106,4 +101,4 @@ kramdown:
   auto_ids: true
   footnote_nr: 1
   entity_output: as_char
-  toc_levels: 1..6
+  toc_levels: 1..6

_data/authors.yml

@@ -1,15 +1,11 @@
 default_author:
-  name:           Your Name
-  picture:        your-photo.jpg
-  email:          [email protected]
+  name:           Imperial Robotics
+  picture:        GroupPicture.JPG
+  email:          semimperialrobotics@gmailcom
   # Use the coder's toolbox at http://coderstoolbox.net/string/#!encoding=xml&action=encode&charset=us_ascii to encode your description into XML string
-  description:    Some Details about yourself
+  description:    Dallas, TX FTC Team 3734
   # Social networking links used in footer. Update and remove as you like.
-  twitter:
-  facebook:
-  github:
-  linkedin:
-  instagram:
-  tumblr:
+  twitter: imperialrob3734
+  instagram: imperialrob3734
   # For Google Authorship https://plus.google.com/authorship
-  google_plus:    "http://plus.google.com/123123123123132123"
+  google_plus:    "http://plus.google.com/123123123123132123"