Add merge test file from rebase tests.
Update merge tests.
Add merge commands.
Update README.md with merge docs.
Add merge task to commands.js
Merge pull request #35 from sgunturi/add-merge-task

Add merge task and tests.