committing some change.
Merge branch 'myBranch1'
Merge branch 'master' of https://github.com/sdorfmei/gitting.git

Conflicts:
	subfolder/myFile.txt