let's try again
killed
Merge branch 'master' of https://github.com/SimonGadgeteer/PROG1

Conflicts:
	Wortstatistik/.project
	Wortstatistik/src/Worthaeufigkeitsanalyse.java
fixed