From 040619d4d3a905ff3cd46ef2337d1a28b39b2ba8 Mon Sep 17 00:00:00 2001 From: jwest60 Date: Tue, 1 Oct 2019 16:16:03 -0400 Subject: [PATCH 01/38] added a comment --- hello.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hello.py b/hello.py index 72647ca..e10dd29 100755 --- a/hello.py +++ b/hello.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 +# aaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbb def helloworld(): pass From 925340c81952284a8d3873cf1477c9c735d11637 Mon Sep 17 00:00:00 2001 From: RetnuhFeel Date: Tue, 1 Oct 2019 16:16:06 -0400 Subject: [PATCH 02/38] added hello world print --- hello.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hello.py b/hello.py index 72647ca..dbbcff3 100755 --- a/hello.py +++ b/hello.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 def helloworld(): - pass + print("hallo, welt!") def add_numbers(x, y): pass From 7e57cb362cc84eedffadb0ff3de6e460ef66b3bf Mon Sep 17 00:00:00 2001 From: Casey Mathews Date: Tue, 1 Oct 2019 16:16:07 -0400 Subject: [PATCH 03/38] good change --- hello.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/hello.py b/hello.py index 72647ca..4f0bafd 100755 --- a/hello.py +++ b/hello.py @@ -3,6 +3,34 @@ def helloworld(): pass + + + + + + + + + + + +#my amazing fix to this code :) + + + + + + + + + + + + + + + + def add_numbers(x, y): pass From 9e1d26d5269469226499ccb1a038010851a141ae Mon Sep 17 00:00:00 2001 From: Chas Baker Date: Tue, 1 Oct 2019 16:16:48 -0400 Subject: [PATCH 04/38] updated hello world --- hello.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hello.py b/hello.py index 72647ca..a37ceab 100755 --- a/hello.py +++ b/hello.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 def helloworld(): - pass + print("Hello world!") def add_numbers(x, y): pass From a466f621f2adb1dfec066e8ba18a0ce70d3ea052 Mon Sep 17 00:00:00 2001 From: Rhett Turner Date: Tue, 1 Oct 2019 16:16:56 -0400 Subject: [PATCH 05/38] Implement some funcs --- hello.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hello.py b/hello.py index 72647ca..c8d7183 100755 --- a/hello.py +++ b/hello.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 def helloworld(): - pass + print("Hello!") def add_numbers(x, y): pass From e8698b64f4113b58a74c785c5e1d582f53038170 Mon Sep 17 00:00:00 2001 From: Casey Mathews Date: Tue, 1 Oct 2019 16:17:45 -0400 Subject: [PATCH 06/38] my good change --- hello.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hello.py b/hello.py index 4f0bafd..d1b9a7c 100755 --- a/hello.py +++ b/hello.py @@ -31,6 +31,7 @@ def helloworld(): + def add_numbers(x, y): pass From c8e8639e479cd4eed2dfd44198759aeb5a727985 Mon Sep 17 00:00:00 2001 From: rdylewsk Date: Tue, 1 Oct 2019 16:18:05 -0400 Subject: [PATCH 07/38] racheals commit --- hello.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hello.py b/hello.py index 72647ca..4478425 100755 --- a/hello.py +++ b/hello.py @@ -8,4 +8,6 @@ def add_numbers(x, y): if __name__ == '__main__': # do something! + print(":)") pass + From f13ee20805bee0b6dbbe1b433270cadae4538ee2 Mon Sep 17 00:00:00 2001 From: Ethan Haworth Date: Tue, 1 Oct 2019 16:18:14 -0400 Subject: [PATCH 08/38] this is a commit --- hello.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hello.py b/hello.py index 72647ca..fbdc16a 100755 --- a/hello.py +++ b/hello.py @@ -4,6 +4,7 @@ def helloworld(): pass def add_numbers(x, y): + x = x + y pass if __name__ == '__main__': From dc818270ed1bc4af4f7a979eeba46b9c79c0ab2c Mon Sep 17 00:00:00 2001 From: Isaac Sikkema Date: Tue, 1 Oct 2019 16:18:43 -0400 Subject: [PATCH 09/38] Zoinks! --- hello.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hello.py b/hello.py index 72647ca..a954aa2 100755 --- a/hello.py +++ b/hello.py @@ -6,6 +6,9 @@ def helloworld(): def add_numbers(x, y): pass +def zoinks(): + print("Zoinks!") + if __name__ == '__main__': # do something! pass From a622c9bd4b185ced99f8bcdf5216c61a1ebf52cc Mon Sep 17 00:00:00 2001 From: Matthew Bianchi Date: Tue, 1 Oct 2019 16:18:43 -0400 Subject: [PATCH 10/38] Yo dog --- hello.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hello.py b/hello.py index 72647ca..10a8652 100755 --- a/hello.py +++ b/hello.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 def helloworld(): - pass + print("What up dude") def add_numbers(x, y): pass From d3634a2a38d764fae3726e47ea22379013da8c80 Mon Sep 17 00:00:00 2001 From: Josh Herman Date: Tue, 1 Oct 2019 16:19:12 -0400 Subject: [PATCH 11/38] test commit --- hello.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hello.py b/hello.py index 72647ca..66feb4b 100755 --- a/hello.py +++ b/hello.py @@ -1,4 +1,6 @@ #!/usr/bin/env python3 +# this is a test comment + def helloworld(): pass From 90d33c07a469222ed075c6dd471c8a451f1f574c Mon Sep 17 00:00:00 2001 From: Daniel Troutman Date: Tue, 1 Oct 2019 16:19:46 -0400 Subject: [PATCH 12/38] Added functions --- hello.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hello.py b/hello.py index 72647ca..ed71dda 100755 --- a/hello.py +++ b/hello.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 def helloworld(): - pass + print("Hello") def add_numbers(x, y): - pass + return x + y if __name__ == '__main__': # do something! - pass + helloworld() From 9add51167b30d01b255aa0b4164d3aa80efc1d02 Mon Sep 17 00:00:00 2001 From: Paul Cote Date: Tue, 1 Oct 2019 16:20:06 -0400 Subject: [PATCH 13/38] Implemented helloworld --- hello.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hello.py b/hello.py index 72647ca..17a57b2 100755 --- a/hello.py +++ b/hello.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 def helloworld(): + print("Hello, World!") pass def add_numbers(x, y): From 1da01fe296275354863dc121bc70ea0b11bd02a7 Mon Sep 17 00:00:00 2001 From: Damian Seals Date: Tue, 1 Oct 2019 16:20:14 -0400 Subject: [PATCH 14/38] Damian Seals made a fix --- hello.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hello.py b/hello.py index 72647ca..bdfcc43 100755 --- a/hello.py +++ b/hello.py @@ -1,11 +1,13 @@ #!/usr/bin/env python3 def helloworld(): - pass + print("hello") def add_numbers(x, y): - pass + print(x + y) if __name__ == '__main__': - # do something! - pass + helloworld() + + add_numbers(5, 10) + pass From e0ed69a4ac72f12a2d5b40f324d4232ffa51b93d Mon Sep 17 00:00:00 2001 From: Tanner Kirby Date: Tue, 1 Oct 2019 16:21:51 -0400 Subject: [PATCH 15/38] why --- hello.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hello.py b/hello.py index 72647ca..12d776e 100755 --- a/hello.py +++ b/hello.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 def helloworld(): + #why are we still here, just to suffer pass def add_numbers(x, y): From 0d10bcb520d2c8880a760052da2870ea4384f0e6 Mon Sep 17 00:00:00 2001 From: Kishan Tailor Date: Tue, 1 Oct 2019 16:23:53 -0400 Subject: [PATCH 16/38] Creating kishan.py --- kishan.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 kishan.py diff --git a/kishan.py b/kishan.py new file mode 100644 index 0000000..8f0ed19 --- /dev/null +++ b/kishan.py @@ -0,0 +1 @@ +print("Welcome to Kishan's World") \ No newline at end of file From a8197eabb9212223d2e807f4d491f901e27c44a3 Mon Sep 17 00:00:00 2001 From: Alex Lambert Date: Tue, 1 Oct 2019 16:25:26 -0400 Subject: [PATCH 17/38] Fixed adding I thonk :think: --- hello.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hello.py b/hello.py index 72647ca..55309b6 100755 --- a/hello.py +++ b/hello.py @@ -2,9 +2,11 @@ def helloworld(): pass - def add_numbers(x, y): - pass + x1 = x; + x2 = y; + return (3*(2*(x1+x2 - (x+y) + (x+y)))/3)*2; + if __name__ == '__main__': # do something! From 01127262c5c7043a97ba634ac53625d2b547ded9 Mon Sep 17 00:00:00 2001 From: Rhett Turner Date: Tue, 1 Oct 2019 16:28:22 -0400 Subject: [PATCH 18/38] um --- hello.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hello.py b/hello.py index c8d7183..8bd8ac3 100755 --- a/hello.py +++ b/hello.py @@ -4,7 +4,7 @@ def helloworld(): print("Hello!") def add_numbers(x, y): - pass + return x + y if __name__ == '__main__': # do something! From f718fafe89ff748c6c88a965679d13421b32f053 Mon Sep 17 00:00:00 2001 From: Josh Herman Date: Tue, 1 Oct 2019 16:28:38 -0400 Subject: [PATCH 19/38] fixed hello world --- hello.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hello.py b/hello.py index 66feb4b..b382c9b 100755 --- a/hello.py +++ b/hello.py @@ -3,7 +3,7 @@ def helloworld(): - pass + print("Hello World") def add_numbers(x, y): pass From b70390dd12a0426a9b3c38490a4c0119583830b7 Mon Sep 17 00:00:00 2001 From: Isaac Sikkema Date: Tue, 1 Oct 2019 16:33:52 -0400 Subject: [PATCH 20/38] Zoinks... --- hello.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hello.py b/hello.py index a954aa2..13bb31d 100755 --- a/hello.py +++ b/hello.py @@ -6,8 +6,8 @@ def helloworld(): def add_numbers(x, y): pass -def zoinks(): - print("Zoinks!") +def zoinks(zoinks): + print("Zoinks...") if __name__ == '__main__': # do something! From cf5853b1c931c6dacc6f886c2873930b7e3bb53f Mon Sep 17 00:00:00 2001 From: Ethan Haworth Date: Tue, 1 Oct 2019 16:34:06 -0400 Subject: [PATCH 21/38] haha yes --- hello.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hello.py b/hello.py index fbdc16a..6b29d08 100755 --- a/hello.py +++ b/hello.py @@ -7,6 +7,9 @@ def add_numbers(x, y): x = x + y pass +def printnothing(a,b,c): + print("") + if __name__ == '__main__': # do something! pass From 74822d6f53cf7802f9e9ca45f1b5f2ad5cc3116b Mon Sep 17 00:00:00 2001 From: Jacob-Duffy Date: Tue, 1 Oct 2019 16:35:10 -0400 Subject: [PATCH 22/38] Changed helloworld --- hello.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hello.py b/hello.py index 72647ca..0d1bf21 100755 --- a/hello.py +++ b/hello.py @@ -1,11 +1,12 @@ #!/usr/bin/env python3 def helloworld(): + print('jduffy3') pass def add_numbers(x, y): pass if __name__ == '__main__': - # do something! + helloworld() pass From cd875155225e1ef6fc33a3661eda717bae65a2fb Mon Sep 17 00:00:00 2001 From: Jordan Neely Date: Tue, 1 Oct 2019 16:35:54 -0400 Subject: [PATCH 23/38] update hello --- hello.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hello.py b/hello.py index 72647ca..f0f9aef 100755 --- a/hello.py +++ b/hello.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 def helloworld(): - pass + print('hello') def add_numbers(x, y): pass From a12ac88406dcdc315852d2e605825340f64f94fa Mon Sep 17 00:00:00 2001 From: Austin Knight Date: Tue, 1 Oct 2019 16:36:53 -0400 Subject: [PATCH 24/38] A comment was added --- hello.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hello.py b/hello.py index 72647ca..06981d8 100755 --- a/hello.py +++ b/hello.py @@ -2,7 +2,7 @@ def helloworld(): pass - +#help me I am trapped somewhere and only have access to this terminal def add_numbers(x, y): pass From b8309cbf4f5e4647e20a3c51fcc33711459f5978 Mon Sep 17 00:00:00 2001 From: Austin Park Date: Tue, 1 Oct 2019 16:37:22 -0400 Subject: [PATCH 25/38] added hi --- hello.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hello.py b/hello.py index 72647ca..f9d24e4 100755 --- a/hello.py +++ b/hello.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 def helloworld(): - pass + print("hi") def add_numbers(x, y): pass From 2d4b6c502f36744b11677e7742a5cd54a1092eb4 Mon Sep 17 00:00:00 2001 From: bchance1 Date: Tue, 1 Oct 2019 16:37:34 -0400 Subject: [PATCH 26/38] implemented hello world function --- hello.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hello.py b/hello.py index 2482622..3cc8144 100755 --- a/hello.py +++ b/hello.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 def helloworld(): - pass + print("Hello World!") def add_numbers(x, y): x = x + y From 62332711e8ceb33e26c253c5d4f8c1ddfede0741 Mon Sep 17 00:00:00 2001 From: Ryan Forsten Date: Tue, 1 Oct 2019 16:37:40 -0400 Subject: [PATCH 27/38] This did nothing --- hello.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hello.py b/hello.py index 72647ca..fe85e1b 100755 --- a/hello.py +++ b/hello.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 def helloworld(): - pass + #this def add_numbers(x, y): - pass + #does if __name__ == '__main__': # do something! - pass + # no it doesn't From ee17224c64751cdcbd46bf747fdf143edf66c8f7 Mon Sep 17 00:00:00 2001 From: drainbolt <46683813+drainbolt@users.noreply.github.com> Date: Tue, 1 Oct 2019 16:38:12 -0400 Subject: [PATCH 28/38] committed comment --- hello.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hello.py b/hello.py index 2482622..2c0a884 100755 --- a/hello.py +++ b/hello.py @@ -13,3 +13,5 @@ def zoinks(zoinks): if __name__ == '__main__': # do something! pass + +#this is a commit From 102c5b2d1630fd886f7e084db64cf5af2f164317 Mon Sep 17 00:00:00 2001 From: Abhi Ravi Date: Tue, 1 Oct 2019 16:39:14 -0400 Subject: [PATCH 29/38] Added a new file --- dontopenthis.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 dontopenthis.py diff --git a/dontopenthis.py b/dontopenthis.py new file mode 100644 index 0000000..d994aff --- /dev/null +++ b/dontopenthis.py @@ -0,0 +1 @@ +##why did you open this From 0f446998845d732602e448ca0ac92b082116d9f5 Mon Sep 17 00:00:00 2001 From: Alex Lambert Date: Tue, 1 Oct 2019 16:39:19 -0400 Subject: [PATCH 30/38] Fixed for real this time --- hello.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hello.py b/hello.py index 55309b6..5b81759 100755 --- a/hello.py +++ b/hello.py @@ -3,9 +3,13 @@ def helloworld(): pass def add_numbers(x, y): - x1 = x; - x2 = y; - return (3*(2*(x1+x2 - (x+y) + (x+y)))/3)*2; + if(x == x+y){ + return x; + }else if(y== x+y){ + return y; + }else{ + return x+y; + } if __name__ == '__main__': From 1b79ccb14574764da8739be22acebb22e2873bb2 Mon Sep 17 00:00:00 2001 From: "Michael \"Blake\" Terry" <44006534+mblaketerry@users.noreply.github.com> Date: Tue, 1 Oct 2019 16:39:58 -0400 Subject: [PATCH 31/38] edited hello added adding functions --- hello.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hello.py b/hello.py index fbdc16a..2b02034 100755 --- a/hello.py +++ b/hello.py @@ -5,6 +5,7 @@ def helloworld(): def add_numbers(x, y): x = x + y + y = 1 + x pass if __name__ == '__main__': From 9b91167bbcc1b5f70f7da6e6ae50db657f7bc986 Mon Sep 17 00:00:00 2001 From: Conner B Date: Tue, 1 Oct 2019 16:41:05 -0400 Subject: [PATCH 32/38] participation cred --- junk.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 junk.txt diff --git a/junk.txt b/junk.txt new file mode 100644 index 0000000..ce01362 --- /dev/null +++ b/junk.txt @@ -0,0 +1 @@ +hello From 55707c194c8b5884171891bb89996550631b324f Mon Sep 17 00:00:00 2001 From: Hyeseong Choi Date: Tue, 1 Oct 2019 16:41:46 -0400 Subject: [PATCH 33/38] commit --- hello.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hello.py b/hello.py index 72647ca..f64178a 100755 --- a/hello.py +++ b/hello.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 def helloworld(): - pass + print('helloworld') def add_numbers(x, y): - pass + return x + y if __name__ == '__main__': # do something! From a70be74685b0b9801a13cfbfca4c54598d936f23 Mon Sep 17 00:00:00 2001 From: Ian Mulet Date: Tue, 1 Oct 2019 16:43:57 -0400 Subject: [PATCH 34/38] zonk --- zonk.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 zonk.py diff --git a/zonk.py b/zonk.py new file mode 100644 index 0000000..e416c75 --- /dev/null +++ b/zonk.py @@ -0,0 +1,17 @@ +#!/usr/bin/env python3 + +def helloworld(): + pass + +def add_numbers(x, y): + x = x + y + pass + +if __name__ == '__main__': + # do something! + pass + +def zonks2(zonks2): + zonks2 = zonks2 + zonks1; + return zonks1; + \ No newline at end of file From 588a91f2371e68971936fb28676b933e366d6515 Mon Sep 17 00:00:00 2001 From: Philip Hicks Date: Tue, 1 Oct 2019 16:46:11 -0400 Subject: [PATCH 35/38] commented --- hello.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hello.py b/hello.py index e10dd29..18c16b5 100755 --- a/hello.py +++ b/hello.py @@ -9,4 +9,5 @@ def add_numbers(x, y): if __name__ == '__main__': # do something! + #or mabye not pass From 629ad346284c548e9d0d2050ab67fcab7cf9e610 Mon Sep 17 00:00:00 2001 From: "Michael \"Blake\" Terry" <44006534+mblaketerry@users.noreply.github.com> Date: Tue, 1 Oct 2019 16:47:21 -0400 Subject: [PATCH 36/38] test commit --- hello.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hello.py b/hello.py index 2b02034..9fc6078 100755 --- a/hello.py +++ b/hello.py @@ -6,6 +6,7 @@ def helloworld(): def add_numbers(x, y): x = x + y y = 1 + x + z= 1 + 1 pass if __name__ == '__main__': From 223a193d9b47b7d028bea74f369114f7d4df2cd2 Mon Sep 17 00:00:00 2001 From: Philip Hicks Date: Tue, 1 Oct 2019 16:49:16 -0400 Subject: [PATCH 37/38] made some important fixes --- hello.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hello.py b/hello.py index 13bb31d..2062781 100755 --- a/hello.py +++ b/hello.py @@ -7,7 +7,8 @@ def add_numbers(x, y): pass def zoinks(zoinks): - print("Zoinks...") + print("Zoinks...") + zoinks(zoinks) if __name__ == '__main__': # do something! From 2d154322f2714b322c85013d5c2625c7ed13300e Mon Sep 17 00:00:00 2001 From: nhobson99 Date: Tue, 1 Oct 2019 16:52:25 -0400 Subject: [PATCH 38/38] You need a readme my dude --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..4a71400 --- /dev/null +++ b/README.md @@ -0,0 +1,12 @@ +# cs340-git-demo +Git presentation demo repo + +You want a readme? I'm sure you do + +bold text + +italic text + +# big text + +-noah