New rules for 4th week
Merge branch 'newrules' into 2