Merge pull request #184 from mattrebor/master

pulling changes into dan2 from master
Updated curriculum spring quarter
Merge pull request #189 from mattrebor/dan2

Dan2