nothing
Merge branch 'master' of github.com:EJEHardenberg/coop-code

pulling from ethan again
adapted new css class names for prism conflicts
added new background color
minor changes
Merge branch 'master' of github.com:scperkins/coop-code