[STARTUP] Cheatsheet installation
Migracje
Komenda wsadowa z dostepem do doctrine
Twig ext
service
[DoctrineFixturesBundle] installation

Conflicts:
	composer.json
[STARTUP] Database: parameters.yml and create-empty-database.sql
Plik wsadowy
DB: bat gitignore
Generated bundle
Merge pull request #1 from mrugala88/dev

Generated bundle
Merge branch '2.2-Cheatsheet' of github.com:gajdaw/symfony-standard
Merge branch 'master' of github.com:tdd-php/literatura
Merge branch '2.2-DoctrineFixturesBundle' of github.com:gajdaw/symfony-standard

Conflicts:
	app/AppKernel.php
Merge branch '2.2-db' of github.com:gajdaw/symfony-standard

Conflicts:
	.gitignore
Zmiana nazwy bazy danych
Test: Blad 200
Merge pull request #3 from otka/dev

Test: Blad 200
Merge branch 'master' of github.com:tdd-php/literatura into dev

Conflicts:
	app/AppKernel.php
	app/config/routing.yml