Conflicts: common/lib/xmodule/xmodule/css/capa/display.scss
common ------ This directory contains common code shared between LMS and CMS, such as Mako templates, CSS, and Coffescript.
