Merging generator
Merging generator
Merge branch 'master' of github.com:matthewhinkle/cs485-gensched
Merge branch 'master' of github.com:matthewhinkle/cs485-gensched