added testing_funk to test.
testing merging. Merge branch 'master' of https://github.com/poppr/poppr