Merge pull request #12 from tomer/master

Updating site with [final?] schedule