update q1
Merge branch 'master' into fatu-assignment