adding canaries
Merge branch 'master' of github.com:ericfode/ferret