From 6d69453580cd7f78a7bf022539e2d26549b6acc1 Mon Sep 17 00:00:00 2001
From: Matt Huntington <matt.huntington@gmail.com>
Date: Fri, 7 Apr 2017 18:59:38 -0400
Subject: [PATCH] sgit

---
 README.md       |  10 ++++
 data_science.md |   9 ----
 python.md       | 123 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 133 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index fb1976f..b916438 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,15 @@
 # Introduction to Data Science Workshop
 
+## Introductions
+
+1. Here's a bit about me
+1. This class can be about networking, too!  Tell us about yourself!
+    - What is Your Name?
+    - What Brings You To GA?
+    - What Are Your Current Activities?
+
+## Curriculum
+
 1. [What Is Data Science?](data_science.md)
 1. [What Is Python?](python.md)
 1. [What Are Algorithms?](algorithms.md)
diff --git a/data_science.md b/data_science.md
index 85aff7a..7cff852 100644
--- a/data_science.md
+++ b/data_science.md
@@ -2,19 +2,10 @@
 
 ## Lesson Objectives
 
-1. Talk About Each Other
 1. Describe What Data Science Is
 1. Describe the Qualities Of A Data Scientist
 1. Describe the Data Science Workflow
 
-## Talk About Each Other
-
-1. Here's a bit about me
-1. This class can be about networking, too!  Tell us about yourself!
-    - What is Your Name?
-    - What Brings You To GA?
-    - What Are Your Current Activities?
-
 ## Describe What Data Science Is
 
 What is it, exactly?
diff --git a/python.md b/python.md
index 8dcdc6d..38a23c8 100644
--- a/python.md
+++ b/python.md
@@ -2,6 +2,8 @@
 
 ## Lesson Objectives
 
+1. Print a message
+1. Add a comment
 1. Create a variable and assign it a value
 1. Explain the different data types
 1. Perform calculations with variables
@@ -11,18 +13,139 @@
 1. Perform a set of commands depending on a situation
 1. Repeatedly perform a set of commands
 
+## Print a message
+
+You can print a message to the user
+
+```python
+print "hello!"
+```
+
+## Add a comment
+
+- Comments let you summarize what you're doing
+- They don't get executed
+
+```python
+# this will not be executed
+```
+
 ## Create a variable and assign it a value
 
+```python
+a = "hello"
+print a ##print the value of the variable 'a'
+```
+
 ## Explain the different data types
 
+There are lots of different types of data that you can use in python
+
+- String (text)
+- Integers (whole numbers)
+- Float (decimal numbers)
+- Booleans (True/False)
+
+You can convert one data type to another
+
+```python
+a = str(1) #a = "1"
+b = int("5") #b = 5
+c = float(4) #c = 4.0
+d = int(5.7) #d = 5
+```
+
 ## Perform calculations with variables
 
+```python
+a = 1
+b = a + 1 #b = 2
+c = b * 3 #c = 6
+d = c - 1 #d = 5
+e = float(d) / 2 #e = 2.5
+f = d ** 2 #exponent: f = 25
+```
+
 ## Use string operations
 
+```python
+a = "first string"
+b = "second string"
+c = a + " " + b
+```
+
 ## Create a list
 
+You can create lists of things
+
+```python
+a = [1, 5, "some string", True, 5.6]
+```
+
+You can even have lists of lists
+
+```python
+a = [
+    [1, 2, 3], #first row
+    [4, 5, 6], #second row
+    [7, 8, 9], #third row
+    [10] #fourth row
+]
+```
+
+You can conceptualize an list of lists however you want
+
+```python
+a = [
+    [1, 4, 7, 10], #first column
+    [2, 5, 8], #second column
+    [3, 6, 9], #third column
+]
+```
 ## Access an element of a list
 
+Lists have elements stored at numerical indexes, starting at 0
+
+```python
+a = [1, 5, "some string", True, 5.6]
+print a[0] #1
+print a[1] #5
+print a[4] #5.6
+```
+
 ## Perform a set of commands depending on a situation
 
+```python
+a = 22
+if a < 10:
+    print "a is less than 10"
+elif a == 10:
+    print "a is 10"
+else:
+    print "a is greater than 10"
+```
+
+The conditions can be
+
+- < less than
+- > greater than
+- <= less than or equal to
+- >= greater than or equal to
+- == an exact match
+
+You can also compare strings:
+
+```python
+a = 'oh hai!'
+if a == 'oh hai!':
+    print 'works'
+```
+
 ## Repeatedly perform a set of commands
+
+```python
+a = 10
+while a < 20:
+    print "the value of a is currently: " + str(a)
+    a = a + 1
+```