Finished course_has_conflict and added tests. Fixed some errors involving Lab courses that still persisted
still getting used to how to commit everything.. left over files from last commit that didn't get updated