Merge pull request #17 from confpub/master

schedule updates
Update, and playing with color assignment