Testar
testar
Merge branch 'dev'

Conflicts:
	.gitignore
	_site/archive/index.html
	_site/bara-sa-att-du-vet-pappa/index.html
	_site/bytype/index.html
	_site/en-levande-logotyp/index.html
	_site/feed.xml
	_site/fem-minuter-fran-mitt-brollop/index.html
	_site/im-joining-valtech/index.html
	_site/index.html
	_site/look-ma-no-database/index.html
	_site/teckenstorlek-med-px-em-eller-rem/index.html
	_site/webbdesign-och-retinaskarmar/index.html
	_site/wywallet-slapp-inte-en-tjanst-om-den-inte-ar-fardig/index.html
.