#860; fixing chunk reference in pusher tutorial
resolving merge conflict #867
Merge pull request #868 from mollybostic/master_resolveconflict

no staging required -- resolving merge conflict