CURSE YOU MERGETOOL
Merge pull request #189 from ElementalAlchemist/curse-you-mergetool

CURSE YOU MERGETOOL