Aanpassingen Adrien
Merge branch 'Dev' of https://github.com/MichelineIsImpossible/JPGEditor into Dev

Conflicts:
	.gitignore
	SourceCode/MAIN.ASM
10/12/13
no message
no message
Merge commit '4fa07f25eabb138dc9959356c52c98a39026987b' into Dev

Conflicts:
	.gitignore
	SourceCode/ENTROPY.ASM
	SourceCode/MAIN.ASM
no message
no message
no message
Revert "no message"

This reverts commit 2f5a5769576e2d1b8f9516b99489fa0fbe1bcb54.
Merge branch 'Dev' of https://github.com/MichelineIsImpossible/JPGEditor into Dev
Makefile
DAT COMPILEERT !!!
:)
probeer toch niet om dat te laten runen, hé :p
Update aan makefile
Merge branch 'Master' into Dev

Conflicts:
	SourceCode/ENTROPY.ASM
	SourceCode/ENTROPY.INC
	SourceCode/MAIN.ASM
	SourceCode/MAKEFILE
Stop Tracking of MAIN.EXE
Progressie bij het afbeelden de JPG