bosse
Merge branch 'master' of https://github.com/simonberz/Skurk

Conflicts:
	js/main.js
fix