week 3 updates from balancerockmedia/angular-workshop
Merge branch 'origin-master'

Conflicts:
	.gitignore
	js/angular-workshop/exercise2/client/js/app.js
	js/angular-workshop/exercise3/js/app.js