moving icon fix to gh-pages
use protocol-agnostic resource loading
fix week
css changes from master
Edit mandatory conflict blurb
Merge remote-tracking branch 'origin/gh-pages'