Updating for the Dec 29 - Jan 2 schedule
Merge branch 'dev'