tests
Merge branch 'master' of https://github.com/mtamer/seg-2105-client-side