Merge pull request #10 from tiger-swallowtails-2013/integrating_classes

Integrating classes
fix wordTracker to run in jasmine
settle merge conflict with master
add test for matcher