added new line
Merge branch 'master' into test

Conflicts:
	testing.txt
Merge pull request #1 from dach384/test

Test