Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Created page of links.
Added shortlink to page w/ all links in presentation.
Merge branch 'gh-pages'