Commit F
Merge branch 'master' into develop

Conflicts:
	sample.txt
Commit G