Merge branch 'master' into gh-pages
Testing GH-Pages Resolution CSS Media
Final Commit for Week 2
Merge branch 'gh-pages'