Ignore merge artifacts.
Merge pull request #3 from rach7110/patch-1

Ignore merge artifacts.