added week 6 template
Merge branch 'master' into week_6
moving week_6 branch into origin_master