Merge pull request #23 from lukaw3d/master

Edit User
Merge pull request #24 from lukaw3d/master

Sprint edit
Merge branch 'master' of https://lukaw3d@github.com/edofic/scrumble.git