User story #27 implemented. Cannot test because of not implemented methods
Conflicts resolved
Testing success
Merge conflicts resolved
Merge conflicts resolved part 2
Merge conflicts resolved
Merge pull request #8 from bolek117/mwitas

Mwitas