no message
Merge branch 'master' of https://github.com/MichelineIsImpossible/JPGEditor

Conflicts:
	.gitignore
	SourceCode/MAIN.ASM