add new
Merge pull request #1 from derLukers/feature1

Added test.md
Merge branch 'develop' into feature-test-markdown

Added more lines

Conflicts:
	test.md