gitignore
Commit

Merge branch 'master' of https://github.com/SalmaF/Symfony2

Conflicts:
	.gitignore
pm
commit

Merge branch 'master' of https://github.com/SalmaF/Symfony2

Conflicts:
	src/web3tc/EchangeBundle/Resources/views/Echange/carte.html.twig
	src/web3tc/EchangeBundle/Resources/views/Echange/formulaire.html.twig
com

Merge branch 'master' of https://github.com/SalmaF/Symfony2

Conflicts:
	nbproject/private/private.xml
	src/web3tc/EchangeBundle/Controller/EchangeController.php
	src/web3tc/EchangeBundle/Resources/views/Echange/carte.html.twig
comm