changed some text
Merge branch 'MartinsBranch' of https://github.com/MartinSvarrer/test into MartinsBranch