Add merge marks checker
Add changelog for mergemarks.
Merge pull request #61 from alexcouper/58_no_merge_marks

58 no merge marks