Combine Art and Installation into one link
Merge branches 'master' and 'gh-pages' of https://github.com/schprc/school-of-machines-2014-slides into dev
Update workshop/software
Add mad mapper cheatcheet slides