DS
Merge branch 'master' of https://github.com/danfri86/Portabal-Format-Laboration

Conflicts:
	incl/.DS_Store