test.txt umbenennen zu test_test.txt
.gitignore hinzugefügt
Merge branch 'master' of https://github.com/WoWMuch/my_project

Conflicts:
	test.txt