Merge pull request #6 from IAMATinyCoder/gh-pages

Merge commits to gh-pages

_config.yml

@@ -26,7 +26,7 @@ authors:
       website: http://www.facebook.com/mbbaxter
       github: EmBeeBee
       twitter: MichelleBBaxter
-      about:  Grad student, pop culture enthusiast.
+      about:  Grad student, pop culture enthusiast. Going to get ALL the bonus points!
   abrown:
       name: Ashley Brown
       prof: false
@@ -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
@@ -100,22 +100,22 @@ authors:
       github: leslieho
       twitter:
       about: Leslie is a BSIS and Anthropology double major.  She really likes puppies.
-  eholmes:
+  erholmes:
       name: Erin Holmes
       prof: false
       gravatar:
       website: http://www.linkedin.com/in/holmeserin
       github: erholmes
       twitter: erinh24
-      about:  Erin is a second year MSIS student and is trying her best at life!
+      about:  Erin is a second year MSIS student and is trying her best at life! She hopes to be a git rockstar in about 3 months!
   ckenrick:
       name: Christopher Kenrick
       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

_includes/program.py

@@ -0,0 +1,10 @@
+import turtle
+
+edward = turtle.Turtle()
+
+for color in ['red', 'blue', 'green', 'yellow']:
+  edward.color(color)
+  edward.forward(75)
+  edward.left(90)
+
+turtle.done()

_includes/program_commented.py

@@ -0,0 +1,37 @@
+# Import the `turtle` module.
+#
+# Modules are bits of code someone else wrote for us.  They rock!
+import turtle
+
+# What's going on here?
+#
+# The `edward =` part is me defining a *name*.  This tells Python
+# to go look at what's after the equals sign when I use the name.
+#
+# The name I've picked is 'edward'.  Names should be descriptive.
+#
+# After the equals sign is where it gets interesting.  We use the
+# `turtle` name to reference the module we've imported.  The dot
+# then tells python to look inside the module for something called
+# `Turtle`.  The `()` just mean we aren't giving that `Turtle` thing
+# any extra information. 
+edward = turtle.Turtle()
+
+# Now comes a `for` statement.
+# 
+# Python will take each of the things after the `in`, assign them
+# to the `color_name` name, and then execute only the statements
+# in the susequent block (the onews with two spaces in front of them)
+for color_name in ['red', 'blue', 'green', 'yellow']:
+
+  # Now what? `edward` seems to have things *inside* him.  These
+  # are called "Methods" and they're something you have to read
+  # the documentation (or see an example) to know about.
+  # Each method lets us control the `edward` turtle in a different way.
+  edward.color(color_name)
+  edward.forward(75)
+  edward.left(90)
+
+# This line of code makes the window wait at the end.  Otherwise it
+# closes.  Comment it out by adding a "#" in front of it to see.
+turtle.done()

_includes/program_two.py

@@ -0,0 +1,23 @@
+import turtle
+
+edward = turtle.Turtle()
+
+
+# Old Code:
+# for color in ['red', 'blue', 'green', 'yellow']:
+#  edward.color(color)
+#  edward.forward(75)
+#  edward.left(90)
+
+def draw_side(turtle_name, color, length, angle):
+  turtle_name.color(color)
+  turtle_name.forward(length)
+  turtle_name.left(angle)
+
+draw_side(edward, 'red', 75, 90)
+draw_side(edward, 'blue', 75, 90)
+draw_side(edward, 'green', 75, 90)
+draw_side(edward, 'yellow', 75, 90)
+
+
+turtle.done()