Fix merge in progress
MergeTwoStrings with bug
Merge branch 'master' of https://github.com/jeremt/gomoku