DommerWut

Wut
Merge remote-tracking branch 'origin/master' into Daniel
fixed errors + new errors

new pages added