fix calanthe-fair-2014 pages
Merge branch 'master' of github.com:Ranyuen/web