adjusted text
Merge branch 'cfp' of github.com:Espenhh/jz13 into cfp

Conflicts:
	content/speakers.html
Merge branch 'cfp' of github.com:Espenhh/jz13 into cfp
conflict in speakers.html