git finished putting to the stage and identified a problem
Merge branch 'master' of github.com:jpsmith1981/presentation-createjs