Implemented chapters, sections, and videos.
Implemented chapters, sections, and videos.
Merge branch 'develop'
Implemented chapters, sections, and videos.
Merge branch 'develop'

Conflicts:
	app/views/course/show.html.erb
Added timeout to User
Merge branch 'develop'