Branch 2: Change 1
Merge pull request #3 from jeffreyfultonca/branch-2

Branch 2: Change 1
Branch 1: Change 1
Branch 1: Change 2