Add pre-push to avoid push on master
add hooks
add hooks
test
Bundle + bootstrap
Merge branch 'master' of https://github.com/EmaInfres5ED/Emargement-Web into devLaurent
Merge branch 'devLaurent' of github.com:EmaInfres5ED/Emargement-Web into devLaurent

Conflicts:
	src/EMA/Bundle/RgementBundle/Controller/DefaultController.php
Change EMA by Ema
delete bundle
Add layout - Basic boostrap one, need to customize
Create bundle EmaRgement
Add bootstrap
Merge pull request #2 from EmaInfres5ED/devLaurent

Dev laurent
Layout + index
Layout + index OK
Merge pull request #3 from EmaInfres5ED/devLaurent

Dev laurent
Merge branch 'master' of https://github.com/EmaInfres5ED/Emargement-Web into devMatthieu

Conflicts:
	src/EMA/Bundle/RgementBundle/Resources/views/Default/index.html.twig
Merge connerie Laurent
Create bundle with correct name
add DS_Store files on gitignore