modified:   app/Resources/views/base.html.twig
	modified:   src/Shorty/FirstBundle/Controller/DefaultController.php
	modified:   src/Shorty/FirstBundle/Resources/config/routing.yml
	modified:   src/Shorty/FirstBundle/Resources/views/Default/index.html.twig
	web/bootstrap/
Merge branch 'master' of https://github.com/viviengaetan/projet-symfony-metinet