[tuts-apply-diff] Applying existing diff file for step installation-create-project
TutsHero: Merge branch '_tuts/episode2-start/start' into '_tuts/episode2-start/installation-create-project' as we walk forward through the steps

* _tuts/episode2-start/start:
  Fixing  code after updating a stub
[tuts-apply-diff] Applying existing diff file for step installation-umask
TutsHero: Merge branch '_tuts/episode2-start/installation-create-project' into '_tuts/episode2-start/installation-umask' as we walk forward through the steps

* _tuts/episode2-start/installation-create-project:
  Fixing  code after updating a stub
[tuts-apply-diff] Applying existing diff file for step installation-playing-with-cookie-lifetime-config
TutsHero: Merge branch '_tuts/episode2-start/installation-umask' into '_tuts/episode2-start/installation-playing-with-cookie-lifetime-config' as we walk forward through the steps

* _tuts/episode2-start/installation-umask:
  Fixing  code after updating a stub
[tuts-apply-diff] Applying existing diff file for step installation-removing-demo-code
TutsHero: Merge branch '_tuts/episode2-start/installation-playing-with-cookie-lifetime-config' into '_tuts/episode2-start/installation-removing-demo-code' as we walk forward through the steps

* _tuts/episode2-start/installation-playing-with-cookie-lifetime-config:
  Fixing  code after updating a stub
[tuts-apply-diff] Applying existing diff file for step bundles-generate-bundle
TutsHero: Merge branch '_tuts/episode2-start/installation-removing-demo-code' into '_tuts/episode2-start/bundles-generate-bundle' as we walk forward through the steps

* _tuts/episode2-start/installation-removing-demo-code:
  Fixing  code after updating a stub
[tuts-apply-diff] Applying existing diff file for step routing-change-routing-pattern-temporarily
TutsHero: Merge branch '_tuts/episode2-start/bundles-generate-bundle' into '_tuts/episode2-start/routing-change-routing-pattern-temporarily' as we walk forward through the steps

* _tuts/episode2-start/bundles-generate-bundle:
  Fixing  code after updating a stub
[tuts-apply-diff] Applying existing diff file for step routing-change-pattern-back
TutsHero: Merge branch '_tuts/episode2-start/routing-change-routing-pattern-temporarily' into '_tuts/episode2-start/routing-change-pattern-back' as we walk forward through the steps

* _tuts/episode2-start/routing-change-routing-pattern-temporarily:
  Fixing  code after updating a stub
[tuts-apply-diff] Applying existing diff file for step routing-pattern-to-path
TutsHero: Merge branch '_tuts/episode2-start/routing-change-pattern-back' into '_tuts/episode2-start/routing-pattern-to-path' as we walk forward through the steps

* _tuts/episode2-start/routing-change-pattern-back:
  Fixing  code after updating a stub
[tuts-apply-diff] Applying existing diff file for step routing-change-name-firstname-routing
TutsHero: Merge branch '_tuts/episode2-start/routing-pattern-to-path' into '_tuts/episode2-start/routing-change-name-firstname-routing' as we walk forward through the steps

* _tuts/episode2-start/routing-pattern-to-path:
  Fixing  code after updating a stub
[tuts-apply-diff] Applying existing diff file for step routing-update-controller-name-firstname
TutsHero: Merge branch '_tuts/episode2-start/routing-change-name-firstname-routing' into '_tuts/episode2-start/routing-update-controller-name-firstname' as we walk forward through the steps

* _tuts/episode2-start/routing-change-name-firstname-routing:
  Fixing  code after updating a stub