Updated for fall semester
Merge pull request #94 from kraftery/kieran2

Updated for fall semester