Changing variable name to be consistent with recording
TutsHero: Merge branch '_tuts/master/auth-code-saving-access-token-and-id-to-db' into '_tuts/master/auth-code-storing-expiration' as we walk forward through the steps

Conflicts:
	client/src/OAuth2Demo/Client/Controllers/CoopOAuthController.php
TutsHero: Merge branch '_tuts/master/auth-code-storing-expiration' into '_tuts/master/auth-code-authorization-declined' as we walk forward through the steps
TutsHero: Merge branch '_tuts/master/auth-code-authorization-declined' into '_tuts/master/auth-code-access-token-request-fails' as we walk forward through the steps
TutsHero: Merge branch '_tuts/master/auth-code-access-token-request-fails' into '_tuts/master/auth-code-redirecting-after-success' as we walk forward through the steps
Changing variable to be consistent with earlier change
TutsHero: Merge branch '_tuts/master/api-copy-api-me-code-for-count-eggs' into '_tuts/master/api-fill-in-user-id-and-access-token' as we walk forward through the steps
TutsHero: Merge branch '_tuts/master/api-fill-in-user-id-and-access-token' into '_tuts/master/api-debug-code' as we walk forward through the steps

Conflicts:
	client/src/OAuth2Demo/Client/Controllers/CountEggs.php
TutsHero: Merge branch '_tuts/master/api-saving-daily-egg-count' into '_tuts/master/api-check-for-no-access-token' as we walk forward through the steps
Updating variable for name change in previous step
Changes from 2 commit(s):

TutsHero: Merge branch '_tuts/master/login-create-user-if-not-logged-in' into '_tuts/master/login-authenticate-the-user' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/master/login-create-user-if-not-logged-in' into '_tuts/master/login-authenticate-the-user' as we walk forward through the steps
Changes from 2 commit(s):

TutsHero: Merge branch '_tuts/master/adding-login-with-coop-button' into '_tuts/master/login-looking-up-existing-users' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/master/adding-login-with-coop-button' into '_tuts/master/login-looking-up-existing-users' as we walk forward through the steps

Conflicts:
	client/src/OAuth2Demo/Client/Controllers/CoopOAuthController.php
Changes from 2 commit(s):

TutsHero: Merge branch '_tuts/master/login-looking-up-existing-users' into '_tuts/master/login-looking-up-existing-by-email' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/master/login-looking-up-existing-users' into '_tuts/master/login-looking-up-existing-by-email' as we walk forward through the steps
Removing extra set of parentheses
Adding a missing redirect in case we need to re-auth
Changes from 3 commit(s):

TutsHero: Merge branch '_tuts/master/facebook-refactor-into-a-method' into '_tuts/master/facebook-retry-on-failure' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/master/facebook-refactor-into-a-method' into '_tuts/master/facebook-retry-on-failure' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/master/facebook-refactor-into-a-method' into '_tuts/master/facebook-retry-on-failure' as we walk forward through the steps
Changes from 3 commit(s):

TutsHero: Merge branch '_tuts/master/facebook-retry-on-failure' into '_tuts/master/facebook-use-access-token-from-db' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/master/facebook-retry-on-failure' into '_tuts/master/facebook-use-access-token-from-db' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/master/facebook-retry-on-failure' into '_tuts/master/facebook-use-access-token-from-db' as we walk forward through the steps

Conflicts:
	client/src/OAuth2Demo/Client/Controllers/FacebookOAuthController.php
Changes from 3 commit(s):

TutsHero: Merge branch '_tuts/master/facebook-use-access-token-from-db' into '_tuts/master/facebook-remove-the-retry-stuff' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/master/facebook-use-access-token-from-db' into '_tuts/master/facebook-remove-the-retry-stuff' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/master/facebook-use-access-token-from-db' into '_tuts/master/facebook-remove-the-retry-stuff' as we walk forward through the steps

Conflicts:
	client/src/OAuth2Demo/Client/Controllers/FacebookOAuthController.php
Changes from 3 commit(s):

TutsHero: Merge branch '_tuts/master/facebook-add-the-login-link' into '_tuts/master/facebook-starting-to-create-a-user' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/master/facebook-add-the-login-link' into '_tuts/master/facebook-starting-to-create-a-user' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/master/facebook-add-the-login-link' into '_tuts/master/facebook-starting-to-create-a-user' as we walk forward through the steps
Changes from 3 commit(s):

TutsHero: Merge branch '_tuts/master/facebook-starting-to-create-a-user' into '_tuts/master/facebook-request-to-me' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/master/facebook-starting-to-create-a-user' into '_tuts/master/facebook-request-to-me' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/master/facebook-starting-to-create-a-user' into '_tuts/master/facebook-request-to-me' as we walk forward through the steps