Resolves conflicting files
Major cleanup. Downloading faster and able to handle situations where students and professors modify the same file creating conflicts.
Major cleanup. Downloading faster and able to handle situations where students and professors modify the same file creating conflicts.