Merge pull request #1 from mh222zr/sprint_1

Sprint 1
Merge pull request #2 from mh222zr/master

Gör min branch up to date