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
Merge branch '05-ng-model' into 06-ng-repeat
Merge branch '06-ng-repeat' into 07-filter
Merge branch '07-filter' into 08-sort-order
Merge branch '08-sort-order' into 09-ng-click
Merge branch '09-ng-click' into 10-ng-submit