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

Conflicts:
	js/angular-workshop/exercise1/client/js/app.js
add bower dir to ignore
serve server on 4000 serve client on 3000
notes from session 2