Korrekturen, kurz vor finish
Merge branch 'master' of https://github.com/sirlordrouter/ch.bfh.btx8081.w2013.green

Conflicts:
	doc/task04/04 CS1 Requirements Document.docx