Merge pull request #1 from silshack/gh-pages

Pulling in recent changes

_config.yml

@@ -65,9 +65,9 @@ authors:
       prof: false
       gravatar:
       website: 
-      github:
-      twitter:
-      about:  
+      github: jkgeer
+      twitter: JakeGeer
+      about: James Geer is a MSIS student at UNC-Chapel Hill after graduating from UNC's undergrad with a degree in Strategic Communications.
   mgillen:
       name: Mary Gillen
       prof: false
@@ -84,14 +84,14 @@ authors:
       github: landongrindheim
       twitter: landongrindheim
       about: Landon is an MSIS student at UNC Chapel Hill. He grew up in North Dakota, but has lived in Idaho, Montana and North Carolina as well as in the Middle East. His brain operates primarily in the humanities.
-  aharding:
-      name: Alexander Harold
+  alexharding:
+      name: Alexander Harding
       prof: false
       gravatar:
       website: 
-      github:
+      github: alexharding
       twitter:
-      about:  
+      about: Alex is a second year MSIS student at SILS and the bottom of the totem pole in the UNC Libraries IT Systems department. He looks forward to working with everyone in this class! 
   lho:
       name: Leslie Ho
       prof: false
@@ -113,9 +113,9 @@ authors:
       prof: false
       gravatar:
       website: 
-      github: 
-      twitter: 
-      about:  
+      github: IAMATinyCoder
+      twitter: ChrisKenrick
+      about: Christopher is a dual-degree student studying Information Science and Public Administration.  
   smantooth:
       name: Stacey Mantooth
       prof: false

_layouts/post.html

@@ -19,3 +19,19 @@ <h2>{{ page.title }}</h2>
 <div class="end">
 	{{ author.about }} Find {{ author.name }} on <a href="http://twitter.com/{{author.twitter}}">Twitter</a>, <a href="http://github.com/{{author.github}}">Github</a>, and <a href="{{author.website}}">on the web</a>.
 </div>
+
+<div id="disqus_thread"></div>
+    <script type="text/javascript">
+        /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
+        var disqus_shortname = 'silshack'; // required: replace example with your forum shortname
+
+        /* * * DON'T EDIT BELOW THIS LINE * * */
+        (function() {
+            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+            dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+    </script>
+    <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+    <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
+

_posts/2013-08-26-Forking-vs-Cloning-on-GitHub.md

@@ -0,0 +1,44 @@
+---
+layout: post
+author: mbaxter
+categories: post
+published: false
+---
+#Forking vs. Cloning on GitHub - What's the difference?#
+First off, **forking** is a vocabulary term that is unique to GitHub.
+
+As best as I can understand it, based on the sources I was able to find, "forking" 
+is different from "cloning" based on where the 'copy' of the repository lives.
+
+If you **clone** a repository, it means that you're making a copy of it and storing 
+it on your personal computer's hard drive, and therefore if you work on a piece 
+of the repository and want to submit a change (aka make a pull request), 
+you have to upload the edited file back onto the GitHub server.
+
+If you **fork** a repository, though, it means that you make a copy that lives in your user account on 
+the GitHub server (so no time or data is lost between downloading and uploading the repository 
+between your computer and GitHub). It lives on the GitHub server, 
+which makes it easier to pull back into the original repository/webpage code after you make edits to the code.
+
+This is different from making **branches** in a workflow. Branches are changes you make within a repository, so
+in my understanding a branch is similar to an entry in a workflow log. For example, Branch 1 is one change/set of changes you've
+within a repository, Branch 2 is yet another change you've made, etc. You then create a pull request to have *your* repository
+merged with the *original* repository, which would apply the changes you made to the original.
+<br></br>
+##My Original Question##
+My main reason for asking why it was called 
+"forking" instead of "cloning" or "copying:" From the new user's 
+standpoint, "forking" something doesn't really 
+denote what the action accomplishes. 
+Compare it to another feature on this website, 
+"follow." You can 'follow' people on GitHub, which means 
+you get updates and notices on their activities. 
+This makes sense - the vocab and its definition are 
+related in an obvious way. It's not the same with "fork" (at least, at first glance).
+<br></br>
+###Sources###
+[http://blogs.atlassian.com/2013/05/git-branching-and-forking-in-the-enterprise-why-fork/](http://blogs.atlassian.com/2013/05/git-branching-and-forking-in-the-enterprise-why-fork/)
+[http://stackoverflow.com/questions/3329943/git-branch-fork-fetch-merge-rebase-and-clone-what-are-the-differences](http://stackoverflow.com/questions/3329943/git-branch-fork-fetch-merge-rebase-and-clone-what-are-the-differences)
+[http://www.youtube.com/watch?v=_jGUFpWYm60](http://www.youtube.com/watch?v=_jGUFpWYm60)
+[http://www-cs-students.stanford.edu/~blynn/gitmagic/ch03.html#_forking_a_project](http://www-cs-students.stanford.edu/~blynn/gitmagic/ch03.html#_forking_a_project)
+[http://stackoverflow.com/questions/6286571/git-fork-is-git-clone?rq=1](http://stackoverflow.com/questions/6286571/git-fork-is-git-clone?rq=1)

_posts/2013-08-26-alex-post.md

@@ -0,0 +1,7 @@
+---
+layout: post
+author: alexharding
+categories: post
+---
+
+**WOW!** I made a post.

_posts/2013-08-26-ambers-post.md

@@ -1,6 +1,6 @@
 ---
 layout: post
-author: amber
+author: asherman
 categories: post
 ---
 

_posts/2013-08-26-marys-post.md

@@ -1,9 +1,8 @@
-----
--layout: post
--author: mgillen
--categories: posts
-----
--
-->*"When you have eliminated all which is impossible, then whatever remains, however improbable, must be the truth.”*
--
--**Arthur Conan Doyle, _The Case-Book of Sherlock Holmes_**
+---
+layout: post
+author: mgillen
+categories: post
+---
+
+**Arthur Conan Doyle, _The Case-Book of Sherlock Holmes_**
+*When you have eliminated all which is impossible, then whatever remains, however improbable, must be the truth.*

_posts/2013-08-28-Jonathan-Code-Highlighting.md

@@ -0,0 +1,15 @@
+---
+layout: post
+author: jpulliza
+categories: test
+title: Jonathan's Simple Python Code
+---
+
+
+
+
+Here is some simple **Python** code:
+
+```python
+print("Hello, World!")
+```

_posts/2013-08-28-Leslie-Syntax-Post.md

@@ -0,0 +1,23 @@
+---
+layout: post
+author: lho
+categories: post
+---
+
+Hey guys, so just looking at some Python code and this was something that Java has, if-else statements, so here's some Python code for that:
+
+```python
+if i < 20:
+    print "That is less than 20."
+    if i % 3 == 0:
+        print "It is divisible by 3."
+elif i == 20:
+    print "That is exactly twenty.  How nice for you."
+else:
+    if i % 2 == 1:
+        print "That is an odd number."
+    else:
+        print "That is twice", i / 2, '.'
+    print "Wow! That's more than 20!"
+```
+

_posts/2013-08-28-Pretty-Code.md

@@ -0,0 +1,102 @@
+---
+layout: post
+author: mbaxter
+category: posts
+---
+
+Here's some lovely code!
+
+```css
+.media-title .bg01, .media-title .bg02, .media-title .bg03 {
+    background-attachment: scroll;
+    background-clip: border-box;
+    background-color: transparent;
+    background-image: none;
+    background-origin: padding-box;
+    background-position: 0 0;
+    background-repeat: repeat;
+    background-size: auto auto;
+    height: 0;
+}
+.gameInfo-title .pageSection {
+    font-size: 90%;
+}
+.media-title .pageSection {
+    font-size: 90%;
+}
+.galleryCarousel .thumbnails {
+    margin-bottom: 0;
+    margin-left: 30px;
+    margin-right: 30px;
+    margin-top: 0;
+}
+.galleryCarousel .thumbnail a {
+    bottom: 5px;
+    left: 5px;
+    right: 5px;
+    top: 5px;
+}
+.gallery .navBack, .gallery .navNext {
+    background-size: auto 100%;
+    height: 38px;
+    width: 27px;
+}
+.footerContent {
+    padding-bottom: 0;
+    padding-left: 3.5%;
+    padding-right: 3.5%;
+    padding-top: 35px;
+}
+.logosRating .logos {
+    float: none;
+    padding-bottom: 20px;
+    padding-left: 0;
+    padding-right: 0;
+    padding-top: 0;
+    width: 100%;
+}
+.logosRating .rating {
+    float: none;
+    margin-bottom: 0;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 0;
+    width: auto;
+}
+.hero-container .landingMessage {
+    font-size: 52%;
+}
+.hero button {
+    font-size: 11px;
+    padding-bottom: 0.4em;
+    padding-left: 1em;
+    padding-right: 1em;
+    padding-top: 0.4em;
+}
+.socialShare {
+    display: none;
+}
+.hero-container .landingMessage {
+    font-size: 42%;
+}
+.videoActions .downloadVideo {
+    font-size: 11px;
+    line-height: 1;
+    width: 120px;
+}
+.youtube-agegate-container {
+    height: 85%;
+}
+.socialLinks li {
+    font-size: 71.4%;
+    letter-spacing: 0;
+}
+.hero-container .landingMessage {
+    font-size: 37%;
+}
+.hero-content .hero-container .landingMessage p {
+    display: none;
+}
+.videoActions .downloadVideo {
+    width: 50px;
+}

_posts/2013-08-28-Syntax-Highlighting-example.md

@@ -0,0 +1,25 @@
+---
+layout: post
+author: danielle
+categories: post
+---
+
+Here is some example code of Ruby: (It was found [here](https://www.ruby-lang.org/en/))
+
+```ruby
+# Ruby knows what you
+# mean, even if you
+# want to do math on
+# an entire Array
+cities  = %w[ London
+              Oslo
+              Paris
+              Amsterdam
+              Berlin ]
+visited = %w[Berlin Oslo]
+
+puts "I still need " +
+     "to visit the " +
+     "following cities:",
+     cities - visited
+```