NEW: Basic pattern for doc
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/de/fhstralsund/project/Window.java