First commit up
Merge https://github.com/echavarria/edx-mit-600.1x

important