resolving merge conflict
Merge branch 'master' of https://github.com/icedtrees/hunts-for-crazy-trees