Update

Update again
edited in feature branch

edited in feature branch
Merge pull request #2 from Christian-Krupa/test_pull_request_feature_branch

edited in feature branch
another line added

another line added
Merge pull request #3 from Christian-Krupa/test_branch

Update projekt2
projekt change
Merge branch 'master' of https://github.com/dkeller85/pull_request_test into dkeller85-master

Conflicts:
	merge2
	projekt2
Merge branch 'dkeller85-master'
new file within master
Merge pull request #5 from Christian-Krupa/master

test