Tweaking activity time
Merge remote-tracking branch 'origin/master'

* origin/master:
  Tweaking activity time
TutsHero: Merge branch '_tuts/master/start' into '_tuts/master/basics-first-echo' as we walk forward through the steps

* _tuts/master/start:
  Tweaking activity time
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:
  Tweaking activity time
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:
  Tweaking activity time
TutsHero: Merge branch '_tuts/master/basics-variable' into '_tuts/master/basics-print-variable' as we walk forward through the steps

* _tuts/master/basics-variable:
  Tweaking activity time
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:
  Tweaking activity time
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:
  Tweaking activity time
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:
  Tweaking activity time
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:
  Tweaking activity time
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:
  Tweaking activity time
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:
  Tweaking activity time
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:
  Tweaking activity time
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:
  Tweaking activity time
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:
  Tweaking activity time
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:
  Tweaking activity time
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:
  Tweaking activity time
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:
  Tweaking activity time
TutsHero: Merge branch '_tuts/master/functions-using-multiple-lines-vars' into '_tuts/master/functions-reverting-to-one-line' as we walk forward through the steps

* _tuts/master/functions-using-multiple-lines-vars:
  Tweaking activity time
TutsHero: Merge branch '_tuts/master/functions-reverting-to-one-line' into '_tuts/master/loops-print-out-3-pets' as we walk forward through the steps

* _tuts/master/functions-reverting-to-one-line:
  Tweaking activity time