Added links & type props
Merge branch 'master' into gh-pages
Added "tableaux"
Merge branch 'master' into gh-pages