nein ich!
Merge branch 'kill_kenny' of github.com:domnikl/test_git into kill_kenny

Conflicts:
	kenny.txt