Merge branch 'refs/heads/master' into gh-pages
changed primer to web foundations
more primer updates
refinements
Merge branch 'refs/heads/gh-pages'