uml
Merge pull request #16 from TuristAppV5/daniel

uml
Merge branch 'master' of https://github.com/TuristAppV5/TuristAppV5 into jacob