formatted code
Merge pull request #1 from pdgarvey/branch1

merge branch 1
fix merge conflict with branch1 change
Merge pull request #2 from pdgarvey/branch2

formatted code
conflict test 3
Merge pull request #3 from pdgarvey/branch2

conflict test 3
resolve conflict