test by Lehr
Merge branch 'master' of https://github.com/magnusbil/OrangeTeam.git