Updates
Merge branch 'master' of https://github.com/Webbdesignkurser/website

Conflicts:
	webbdesign/_posts/2014-04-24-inledning.md