Updated schedule
Merge branch 'master' of github.com:hacksu/Website