fredagens arbeid
Merge branch 'master' of https://github.com/havhol/my_daughters_promnight_site

Conflicts:
	dist/scripts/main.js