week 3.5 update
Week 4
Merge branch 'master' into gh-pages

Conflicts:
	blue-nav/css/style.css
	blue-nav/index.html