update

Changes to be committed:
	new file:   Function-21371404.py
	new file:   main.py

Function-20374188.py

@@ -1 +1,2 @@
-print('My Student_ID is 20374188')
+print('My Student_ID is 20374188')
+print('My Name is 李子萌')

Function-20376345.py

@@ -1 +1,2 @@
 print("My Student_ID is 20376345")
+print('My Name is 罗军忠')

Function-21371404.py

@@ -0,0 +1,2 @@
+print('My Student_ID is 21371404')
+print('My Name is 唐人杰')

Function-21373457.py

@@ -0,0 +1,2 @@
+print('My Student_ID is 21373457')
+print('My Name is 唐鸣宇')

main.py

@@ -1,3 +1,8 @@
+#<<<<<<< HEAD
 # main.py 文件的内容修改为
+#import os
+#os.system('python Function-20374188.py')
+#=======
 import os
-os.system('python Function-学号.py')
+os.system('python Funtion-21371404.py')
+#>>>>>>> Student-21371404