new change
Merge branch 'master' of https://github.com/Urne/try_git

Have to merge because andreas did some changes
new awesome commit
Merge branch 'master' of https://github.com/Urne/try_git

Merging Windows computer changes and Linux