merge with octopress/master
add functional differential geometry to wiki
mention llpp, remove xpdf, add a fix for beamer in advi
add some exercise in sicm
add computer-aided-reasoning-an-approach to wiki