Merged in default

404.html

courseware.html

gradebook.html

login.html

main.html

registration/password_reset_confirm.html

sass/_gradebook.scss

sass/_info.scss

sass/application.scss

sass/base/_extends.scss

sass/base/_variables.scss

sass/courseware/_sequence-nav.scss

sass/courseware/_sidebar.scss

sass/courseware/_video.scss

sass/discussion/_answers.scss

sass/discussion/_forms.scss

sass/discussion/_profile.scss

sass/discussion/_question-view.scss

sass/layout/_layout.scss

sass/wiki/_wiki.scss