Mergal konflikte

Manjkajoč CourseResource v urls.py in resources.py