Filtered enrollable courses to be only present or future courses and got rid of duplicates
Merge remote-tracking branch 'origin/master'