Add note to clarify about 5 versus 6
Update metadata.yml
Merge remote-tracking branch 'origin/master'

* origin/master:
  Update metadata.yml
  Add note to clarify about 5 versus 6

Conflicts:
	knpu/episode3/metadata.yml
TutsHero: Merge branch '_tuts/master/start' into '_tuts/master/installation-create-project' as we walk forward through the steps

* _tuts/master/start:
  Update metadata.yml
  Add note to clarify about 5 versus 6
TutsHero: Merge branch '_tuts/master/installation-create-project' into '_tuts/master/installation-umask' as we walk forward through the steps

* _tuts/master/installation-create-project:
  Update metadata.yml
  Add note to clarify about 5 versus 6
TutsHero: Merge branch '_tuts/master/installation-umask' into '_tuts/master/installation-playing-with-cookie-lifetime-config' as we walk forward through the steps

* _tuts/master/installation-umask:
  Update metadata.yml
  Add note to clarify about 5 versus 6
TutsHero: Merge branch '_tuts/master/installation-playing-with-cookie-lifetime-config' into '_tuts/master/installation-removing-demo-code' as we walk forward through the steps

* _tuts/master/installation-playing-with-cookie-lifetime-config:
  Update metadata.yml
  Add note to clarify about 5 versus 6
TutsHero: Merge branch '_tuts/master/installation-removing-demo-code' into '_tuts/master/bundles-generate-bundle' as we walk forward through the steps

* _tuts/master/installation-removing-demo-code:
  Update metadata.yml
  Add note to clarify about 5 versus 6
TutsHero: Merge branch '_tuts/master/bundles-generate-bundle' into '_tuts/master/routing-change-routing-pattern-temporarily' as we walk forward through the steps

* _tuts/master/bundles-generate-bundle:
  Update metadata.yml
  Add note to clarify about 5 versus 6
TutsHero: Merge branch '_tuts/master/routing-change-routing-pattern-temporarily' into '_tuts/master/routing-change-pattern-back' as we walk forward through the steps

* _tuts/master/routing-change-routing-pattern-temporarily:
  Update metadata.yml
  Add note to clarify about 5 versus 6
TutsHero: Merge branch '_tuts/master/routing-change-pattern-back' into '_tuts/master/routing-pattern-to-path' as we walk forward through the steps

* _tuts/master/routing-change-pattern-back:
  Update metadata.yml
  Add note to clarify about 5 versus 6
TutsHero: Merge branch '_tuts/master/routing-pattern-to-path' into '_tuts/master/routing-change-name-firstname-routing' as we walk forward through the steps

* _tuts/master/routing-pattern-to-path:
  Update metadata.yml
  Add note to clarify about 5 versus 6
TutsHero: Merge branch '_tuts/master/routing-change-name-firstname-routing' into '_tuts/master/routing-update-controller-name-firstname' as we walk forward through the steps

* _tuts/master/routing-change-name-firstname-routing:
  Update metadata.yml
  Add note to clarify about 5 versus 6
TutsHero: Merge branch '_tuts/master/routing-update-controller-name-firstname' into '_tuts/master/routing-add-count-wildcard' as we walk forward through the steps

* _tuts/master/routing-update-controller-name-firstname:
  Update metadata.yml
  Add note to clarify about 5 versus 6
TutsHero: Merge branch '_tuts/master/routing-add-count-wildcard' into '_tuts/master/routing-add-count-argument-name' as we walk forward through the steps

* _tuts/master/routing-add-count-wildcard:
  Update metadata.yml
  Add note to clarify about 5 versus 6
TutsHero: Merge branch '_tuts/master/routing-add-count-argument-name' into '_tuts/master/routing-switch-argument-order' as we walk forward through the steps

* _tuts/master/routing-add-count-argument-name:
  Update metadata.yml
  Add note to clarify about 5 versus 6
TutsHero: Merge branch '_tuts/master/routing-switch-argument-order' into '_tuts/master/routing-removing-debug' as we walk forward through the steps

* _tuts/master/routing-switch-argument-order:
  Update metadata.yml
  Add note to clarify about 5 versus 6
TutsHero: Merge branch '_tuts/master/routing-removing-debug' into '_tuts/master/controller-returning-direct-response' as we walk forward through the steps

* _tuts/master/routing-removing-debug:
  Update metadata.yml
  Add note to clarify about 5 versus 6
TutsHero: Merge branch '_tuts/master/controller-returning-direct-response' into '_tuts/master/controller-return-a-json-response' as we walk forward through the steps

* _tuts/master/controller-returning-direct-response:
  Update metadata.yml
  Add note to clarify about 5 versus 6
TutsHero: Merge branch '_tuts/master/controller-return-a-json-response' into '_tuts/master/controller-set-content-type' as we walk forward through the steps

* _tuts/master/controller-return-a-json-response:
  Update metadata.yml
  Add note to clarify about 5 versus 6