småfiksfaks
Merge branch 'master' of https://github.com/hkjersem/specifique

Conflicts:
	js/split.js