Merge remote-tracking branch 'refs/remotes/origin/master'

Author: phrdang

1_beginner/chapter4/practice/simplify.py

@@ -0,0 +1,12 @@
+"""Here is a block of code where one tries do determineif somone is a nobel prize winner.
+
+Rewrite the code to work in one statement
+"""
+
+if (doesSignificantWork):
+    if (makesBreakthrough):
+        nobelPrizeCandidate = True
+    else:
+        nobelPrizeCandidate = False
+elif(not doesSignificantWork):
+    nobelPrizeCandidate = False

1_beginner/chapter4/solutions/simplify.py

@@ -0,0 +1,4 @@
+''' Here is a block of code where one tries do determine if
+somone is a nobel prize winner. Rewrite the code to work in one statement'''
+
+nobelPrizeCandidate = doesSignificantWork and makesBreakhrough

1_beginner/chapter6/practice/delete_this.txt

@@ -0,0 +1 @@
+DELETE THIS FILE!!!

1_beginner/chapter6/solutions/delete_this.txt

@@ -0,0 +1 @@
+DELET THIS FILE!!!