merging example
merge example master branch
Merge branch 'testMerge'

Conflicts:
	testing