Merge branch 'master' of https://github.com/veronicaskud/vskud

Conflicts:
	public/telling/website/index.html
not sure what i'm doing :)
index page changes again