Unmerged changes
Merge branch 'master' of https://github.com/NicholasMcCarthy/paratiles

Conflicts:
	scripts/script_ImageClassification.m
Merge branch 'master' of https://github.com/NicholasMcCarthy/paratiles