Code for merge-resources looks good
Delete plan.txt
Delete plan.txt~
Delete tout
Namespaces fixed, merge-resources passing its tests.
Merging in changes from fixns branch
Merge pull request #1 from tsleyson/fixns

Namespaces fixed, merge-resources passing its tests.
Merge branch 'filemerge' of github.com:tsleyson/clean_html into filemerge