Merge branch 'master' of https://github.com/Lily44/mctc_and_redo

Conflicts:
stylesheets/app.css