Week 1 b2 assignment
Merge branch 'master' into gh-pages