resolved merge conflict
fixed merge conflict
Merge pull request #49 from extensibleweb/DOMString

DOMString tests