Subjects from IAP
Updated subjects
Merge pull request #19 from uWaterloo/subjects

Updated subjects and added subject unit. Closes #18