Added composer.lock
Deleted composer.lock
Added correct routing and twig structure
Fixed merge conflict