Add markup test for nested comments
Add markup test for the infix keyword
Merge branch 'test/haskell'