Symfony2 creando repositorio
capfile
Merge branch 'master' of https://github.com/Gorka89/Symfony2

Conflicts:
	README.md
Merge branch 'master' of https://github.com/Gorka89/Symfony2

Conflicts:
	README.md