renamed and ammended
should be first only
Merge branch 'master' of https://github.com/markolsen42/marksGittest