Merge branch 'master' of github.com:dunknicoll/dog
working on adjusting dog to terrain
Merge branch 'master' into gh-pages