2nd change on topic branch
3rd change on topic branch
1st commit on master
4th commit to topic
fixed conflict 1
Revert "fixed conflict 1"

This reverts commit 1a730ed09e8c7d3c477117aae279e304e121678f, reversing
changes made to 14393e517316a079db30d6400eac06d9ff2e18b6.
Adding new file so I can test commits w/out conflicts
1st commit to topic
1st commit to master
Merge branch 'topic'