A

B

C

D
Merge branch 'master' of https://github.com/Esodian/test

Conflicts:
	test.txt