added text
Merge branch 'test' of https://github.com/charlp1/test into test

Conflicts:
	test.txt