Week 3 Updates
Merge branch 'gh-pages'