whoops, didn't mean to commit those...
having the root index redirect was annoying!
Merge pull request #19 from beautyjoy/brian-curriculum

having the root index redirect was annoying!
Merge branch 'gh-pages' of github.com:beautyjoy/bjc-r into gh-pages
brian's modifications merged by Nate, looking manually at each one
merge of new activities from brians curriculum pass
Merge branch 'brian-curriculum' into gh-pages
updating quiz stuff, starting to fix content.
made berkeley_bjc course, starting to differentiate from pd_bjc
renaming list topics, moved a few things from topic 2 to topic 3
Merge pull request #2 from beautyjoy/gh-pages

synchronizing with beauty joy