Testing more conflicts
Merge branch 'master' of
git@github.com:rubenwolff/ETHz_HeadlineGenerator.git

Conflicts:
	ETHz_HeadlineGen/src/FirstSentSum.java