Code from demo included

Folder: code_from_demo
Uncommited

Litt usikker på endringene her
Merge branch 'master' of https://github.com/havhol/my_daughters_promnight_site

Conflicts:
	app/index.html