testing matching text
add matching test
fix merge conflict
Merge pull request #6 from tiger-swallowtails-2013/tdd_testing

Tdd testing