second try
test
merge

Merge branch 'master' of github.com:KristinSchroeter/Statistik-f-r-Sprachwissenschaftler

Conflicts:
	KristinSchroeter/erst.R