User Story 2

Finish user story 2 by Gergely