Take free days into account for sorting functions
Merge branch 'master' of github.com:hfaran/ubc_timetabler