ooo
Merge branch 'master' of https://github.com/prob5818/Test

Conflicts:
	A.txt