Merge branch 'master' of /Users/ernestoestrada/IdeaProjects/PPL-Fall-2018 with conflicts.

quadroots

@@ -0,0 +1,16 @@
+print "enter a:"
+
+a = input()
+
+print "enter b:"
+b = input()
+print "enter c:"
+c = input()
+
+disc = pow(b,2) - 4*a*c
+
+x1 = (-b - sqrt(disc) ) / (2*a)
+x2 = (-b + sqrt(disc) ) / (2*a)
+
+print "x1: "    print x1    newline
+print "x2: "    print x2    newline