all features tests working
98% covered
ran a test
merge conflict resolved for tests-merge and master merge
tests have been fixed, one test pending
Merge pull request #25 from fox-squirrels-2013/tests-merge

Tests merge