something
Merge branch 'casey'
this
nothing changed
something
Paul Commit Attempt
Merge branch 'paul'
cleaned up highlighting code in syllabus show view
fixed highlighting code in syllabus show view
fixed .gitignore?
Test
plaintext and component controller fixes, added create component functionality
commit
Commiting to pull
fix chris' highlight function declarion, which I broke
installed haml, changed all templates to haml, deleted unused templates
database changes
testing contenteditable on new component div
some CSS adjustments
aaand another CSS change