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

Conflicts:
	incl/script.js
ds
ds
ds
sc
Merge branch 'master' of https://github.com/danfri86/Portabal-Format-Laboration

Conflicts:
	incl/script.js
Testpush
Merge branch 'master' of https://github.com/danfri86/Portabal-Format-Laboration
Merge branch 'master' of https://github.com/danfri86/Portabal-Format-Laboration

Conflicts:
	.DS_Store