addede comment on child branch
Merge branch 'achildbranchmaybe' onto master and resolved conflicts and even added some additional text