Edit my text file
Resolve merge conflict
Merge pull request #2 from hannahhoward/merbranch

Fixed your bug in your awesome.txt