url modification:
url(r'^courses/$',include("courses.urls"))
Merge remote-tracking branch 'origin/master'
modified urls
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/urls.py
Merge remote-tracking branch 'origin/master'
modification of html
i don't know why?????
Merge remote-tracking branch 'origin/master'