Merge pull request #232 from ClareCat/master

getting jobfair ready for 2014
Merge branch 'master' of https://github.com/acm-uiuc/liquid