add a readme file
add all
modify
add distributed
append GPL
understand how stage works
git tracks changes
git track changes of files
add test.txt
Merge branch 'master' of github.com:xiangxing98/learn_git

Conflicts:
	readme.txt