git reset HEAD hello_git.py
This is the hello_world.c to the github
This is the makefile of the github
Merge branch 'master' of github.com:LingboTang/Forking_Pro

Conflicts:
	hello_git.py