less waiting
Merge branch 'master' of https://github.com/mrooding/full-stack-javascript-summerclass

Conflicts:
	app/scripts/week_entry/timesheetWeekCtrl.js

Fixed conflicts