[tuts-apply-diff] Applying existing diff file for step form-create-pets-new-php
TutsHero: Merge branch '_tuts/master/layout-create-and-use-header-footer' into '_tuts/master/form-create-pets-new-php' as we walk forward through the steps

* _tuts/master/layout-create-and-use-header-footer:
  Renaming a step
  Part through the get_pet stuff
TutsHero: Merge branch '_tuts/master/layout-create-and-use-header-footer' into '_tuts/master/form-create-pets-new-php' as we walk forward through the steps

* _tuts/master/layout-create-and-use-header-footer:
  Finishing up steps with binding parameters and sql errors
updated image for php ep 2
TutsHero: Merge branch '_tuts/master/start' into '_tuts/master/basics-first-echo' as we walk forward through the steps

* _tuts/master/start:
  updated image for php ep 2
TutsHero: Merge branch '_tuts/master/basics-first-echo' into '_tuts/master/basics-open-php-tag' as we walk forward through the steps

* _tuts/master/basics-first-echo:
  updated image for php ep 2
TutsHero: Merge branch '_tuts/master/basics-open-php-tag' into '_tuts/master/basics-variable' as we walk forward through the steps

* _tuts/master/basics-open-php-tag:
  updated image for php ep 2
TutsHero: Merge branch '_tuts/master/basics-variable' into '_tuts/master/basics-print-variable' as we walk forward through the steps

* _tuts/master/basics-variable:
  updated image for php ep 2
TutsHero: Merge branch '_tuts/master/basics-print-variable' into '_tuts/master/basics-number-variable' as we walk forward through the steps

* _tuts/master/basics-print-variable:
  updated image for php ep 2
TutsHero: Merge branch '_tuts/master/basics-number-variable' into '_tuts/master/basics-syntax-error' as we walk forward through the steps

* _tuts/master/basics-number-variable:
  updated image for php ep 2
TutsHero: Merge branch '_tuts/master/basics-syntax-error' into '_tuts/master/basics-fix-syntax' as we walk forward through the steps

* _tuts/master/basics-syntax-error:
  updated image for php ep 2
TutsHero: Merge branch '_tuts/master/basics-fix-syntax' into '_tuts/master/functions-using-rand' as we walk forward through the steps

* _tuts/master/basics-fix-syntax:
  updated image for php ep 2
TutsHero: Merge branch '_tuts/master/functions-using-rand' into '_tuts/master/functions-rand-with-argument' as we walk forward through the steps

* _tuts/master/functions-using-rand:
  updated image for php ep 2
TutsHero: Merge branch '_tuts/master/functions-rand-with-argument' into '_tuts/master/functions-rand-2-arguments' as we walk forward through the steps

* _tuts/master/functions-rand-with-argument:
  updated image for php ep 2
TutsHero: Merge branch '_tuts/master/functions-rand-2-arguments' into '_tuts/master/functions-ucwords' as we walk forward through the steps

* _tuts/master/functions-rand-2-arguments:
  updated image for php ep 2
TutsHero: Merge branch '_tuts/master/functions-ucwords' into '_tuts/master/functions-misisng-arg-error' as we walk forward through the steps

* _tuts/master/functions-ucwords:
  updated image for php ep 2
TutsHero: Merge branch '_tuts/master/functions-misisng-arg-error' into '_tuts/master/functions-using-strtolower-with-an-echo' as we walk forward through the steps

* _tuts/master/functions-misisng-arg-error:
  updated image for php ep 2
TutsHero: Merge branch '_tuts/master/functions-using-strtolower-with-an-echo' into '_tuts/master/functions-fxns-in-your-fxns-strrev' as we walk forward through the steps

* _tuts/master/functions-using-strtolower-with-an-echo:
  updated image for php ep 2
TutsHero: Merge branch '_tuts/master/functions-fxns-in-your-fxns-strrev' into '_tuts/master/functions-call-order-with-strtoupper' as we walk forward through the steps

* _tuts/master/functions-fxns-in-your-fxns-strrev:
  updated image for php ep 2
TutsHero: Merge branch '_tuts/master/functions-call-order-with-strtoupper' into '_tuts/master/functions-using-multiple-lines-vars' as we walk forward through the steps

* _tuts/master/functions-call-order-with-strtoupper:
  updated image for php ep 2