Småpirk
Merge branch 'master' of https://github.com/hkjersem/specifique

Conflicts:
	index.html
	js/main-min.js
	js/main.js