JS <-> PHP
Merge branch 'master' into Steinar

Conflicts:
	index.html
	style.css
UMM, hva har skjedd her?