updating package.json
Merge branch '1-setup' into 2-yo-angular-route
Merge branch '02-yo-angular-route' into 03-ng-view
Merge branch '03-ng-view' into 04-protractor

Conflicts:
	package.json
Merge branch '04-protractor' into 05-ng-model