-n 
Changed url from studiokallbom.se -> www.studiokallbom.se (hopefully)
-n 
Merge branch 'master' of github.com:studiokallbom/studiokallbom.se

Conflicts:
	app/work/index.html
	dist/about/index.html
	dist/contact/index.html
	dist/index.html
	dist/work/index.html