improved constraints
Merge branch 'master' of github.com:aprex/timetabling