Merge pull request #29 from asgrim/master

Added schedule to website
Merge remote-tracking branch 'upstream/master'