Add a thing
Minor modification to the thing
Fixed merge conflict
Merge pull request #491 from MediaCrush/add-a-thing

Add a thing