added Wolfram, Markus, Jian to consortium
added affordance workshop
added Junge Uni Tag, Innsbruck
added ~*
Merge branch 'master' of https://github.com/mzillich/website into mzillich-master

Conflicts:
	squirrel_website/html/pages/home.html
Merge branch 'mzillich-master'