android updated. week 4 FINAL