Merge pull request #7 from nrnb/master

latest from nrnb
adds marcotte lab course
adds marcotte lab course
Merge pull request #14 from khanspers/master

updates course listing