still trying to synch up
mergeconflicts...
merging still..............
Merge branch 'master' of https://github.com/johhov/DagOgNatt