Adding proceedings to website
Merge branch 'master' of github.com:heathermiller/wwwscala14