before merging
Merge branch 'master' of https://github.com/havhol/my_daughters_promnight_site
input checkbox default html
Merge branch 'master' of https://github.com/havhol/my_daughters_promnight_site

Conflicts:
	app/kalender.html