Displaying classes now in Make Schedula

Make Schedule changes
Resolved all conflicts

Fixing all conflicts and syncing