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

Conflicts:
	.gitignore
	SourceCode/MAIN.ASM
no message
Merge branch 'master' of https://github.com/MichelineIsImpossible/JPGEditor

Conflicts:
	SourceCode/ENTROPY.ASM
	SourceCode/ENTROPY.INC
Merge commit '4fa07f25eabb138dc9959356c52c98a39026987b' into Dev

Conflicts:
	.gitignore
	SourceCode/ENTROPY.ASM
	SourceCode/MAIN.ASM