whoops, didn't mean to commit those...
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