Added test.md
add new
Merge pull request #1 from derLukers/feature1

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

Added more lines

Conflicts:
	test.md
Merge pull request #4 from derLukers/feature-test-markdown

looks good merged
new version
Merge pull request #5 from derLukers/feature2

A list
Added the ZSH-History
Merge pull request #7 from derLukers/feature-zsh-history

Feature zsh history
Merge pull request #5 from derLukers/master

Some changes