Curtis' third changes.
This is some work for a new feature.
Adding some more work to my awesome feature.
Curtis' second changes.
Another change to my file.
Another change for my feature.
This is a new commit to resolve conflicts.