updating protractor et al
Merge branch 'lab-1-setup-solved' into lab-2-angular

* lab-1-setup-solved:
  updating protractor et al