added department
Merge pull request #1 from pdgarvey/branch1

merge branch 1
fix merge conflict with branch1 change