Merge branch 'master' into planning
adds templates directory, week plan template, edits calendar.md, adds week 06, 07 plans
expands week 06, pushes sass to next week, includes Al's recommendations
renames week06_plan
adds links to week06_plan
minor update to week06 links
Merge branch 'planning'
adds code examples to week04