first comit mo3
Merge remote-tracking branch 'origin/g1' into g1

Conflicts:
	g1.txt