small test
merge conflicts
Merge branch 'master' into animation
test coverage
Merge branch 'animation' of github.com:kdoyne/quick_shark into kdoyne-animation
fixed merge conflicts