Generated bundle
Merge branch 'master' of github.com:tdd-php/literatura into dev

Conflicts:
	app/AppKernel.php
	app/config/routing.yml
Merge pull request #4 from mrugala88/dev

Generated bundle