Merge branch 'master' of https://mit.cs.uchicago.edu/ethanmertz/CS-123-Final

Python/py_split.py

 import re
 
-reg = "#include"
-
 def go():
 	print("going")
 	count = 0

Python/topfunctions.py

@@ -37,7 +37,7 @@ class TopFunctions(MRJob):
             count += s[0]
             score += s[2]
         total = int(l[0][1])
-        yield name, (count, score)
+        yield name, (count, total, score)
 
     def reducer_init(self):
         self.h = [(-float("inf"), "")]