first commit !
Merge branch 'master' of https://github.com/jsmagghe/tcg

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