Fixat det sista
Merge branch 'master' of https://github.com/Wikberg/skate

Conflicts:
	index.php