This a test conflict
Resolved merge conflicts
Merge pull request #2 from collinatherton/master

Resolving merge conflicts