min ändring
Merge pull request #5 from NeoTech/JP2

min ändring
Merge remote-tracking branch 'origin/master' into AP1

Conflicts:
	test.txt
12