adding comments
Merge branch 'develop' of github.com:czolnowski/ng-workshops into develop

Conflicts:
	app/scripts/mocks/mocks.js