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

Conflicts:
	test.txt