Update 1.txt: a1
Merge branch 'master' of github.com:Marslo/GitStudy