123
123
123
test commit
Merge branch 'dev' of https://github.com/ArtemKiev/trainer

Conflicts:
	app/AppKernel.php
	app/config/routing.yml
	app/logs/dev.log
	app/logs/prod.log
	src/Blogger/GenBundle/BloggerGenBundle.php
	src/Blogger/GenBundle/Controller/DefaultController.php
	src/Blogger/GenBundle/Resources/config/routing.yml
	src/Blogger/GenBundle/Resources/views/Default/index.html.twig
1