fiksa
Merge branch 'master' of https://github.com/fsjulstad/RateMyStuff

Conflicts:
	Versjon 1/index.html