ohne Wikipedia
Merge branch 'noWiki' of https://github.com/sonynka/infoLab3 into noWiki