4
Merge branch 'master' of https://github.com/andretseng/gitlearning into b

Conflicts:
	1.txt