projects
Merge branch 'develop' of https://github.com/czolnowski/ng-workshops into develop

Conflicts:
	app/index.html
	app/scripts/app.js
	app/styles/main.scss