Fix annotation bug (Greed added empty annotations to problem statement HTML)
Merge branch 'annotation' into vex20