Making conflicts, brah
Merge branch 'master' of https://github.com/golvmopp/sdmapeg

Conflicts:
	testGmop
Merge branch 'master' of https://github.com/golvmopp/sdmapeg