switching from courses to slots
merged conflict in ajax.py
conflict resolution implemented