Moving the stylesheets into the base template
Spelling out the CSS files individually
Changes from 2 commit(s):

TutsHero: Merge branch '_tuts/upgrade/mindtrick-removing-the-app-variable' into '_tuts/upgrade/mindtrick-flexing-the-block-function' as we walk forward through the steps

Conflicts:
	app/Resources/views/base.html.twig

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

TutsHero: Merge branch '_tuts/upgrade/mindtrick-removing-the-app-variable' into '_tuts/upgrade/mindtrick-flexing-the-block-function' as we walk forward through the steps
Changes from 2 commit(s):

TutsHero: Merge branch '_tuts/upgrade/mindtrick-flexing-the-block-function' into '_tuts/upgrade/mindtrick-twig-whitespace-control' as we walk forward through the steps

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

TutsHero: Merge branch '_tuts/upgrade/mindtrick-flexing-the-block-function' into '_tuts/upgrade/mindtrick-twig-whitespace-control' as we walk forward through the steps
Merge remote-tracking branch 'origin/upgrade' into upgrade