made a change
yet another change was made
hotfix comment added
another comment added
manually merged changed
Merge branch 'tutorial'

Conflicts:
	src/Acme/DemoBundle/Resources/config/routing.yml